Skip to content

Commit c613040

Browse files
committed
PHP 8.4 #12152
1 parent 04dbc7f commit c613040

File tree

9 files changed

+63
-258
lines changed

9 files changed

+63
-258
lines changed

.github/workflows/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
fail-fast: false
88
matrix:
99
php-version:
10-
- '8.2'
10+
- '8.4'
1111

1212
name: PHP ${{ matrix.php-version }}
1313

@@ -49,7 +49,7 @@ jobs:
4949
- name: Setup PHP, with composer and extensions
5050
uses: shivammathur/setup-php@v2
5151
with:
52-
php-version: 8.2
52+
php-version: 8.4
5353
coverage: none
5454
extensions: bcmath, fileinfo, json, pdo
5555
tools: cs2pr

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
]
2222
},
2323
"require": {
24-
"php": "^8.2"
24+
"php": "^8.4"
2525
},
2626
"require-dev": {
2727
"friendsofphp/php-cs-fixer": "@stable",

composer.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/TestConfiguration.php.dist

Lines changed: 0 additions & 141 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,6 @@
4141
*/
4242
defined('TESTS_ZEND_OB_ENABLED') || define('TESTS_ZEND_OB_ENABLED', false);
4343

44-
/**
45-
* Zend_Cloud online tests
46-
*
47-
* You may need to provide connection details for specific adapters under their
48-
* specific configuration settings elsewhere in this file.
49-
*/
50-
defined('TESTS_ZEND_CLOUD_STORAGE_WINDOWSAZURE_CONTAINER') || define('TESTS_ZEND_CLOUD_STORAGE_WINDOWSAZURE_CONTAINER', 'simplecloudcontainer');
51-
5244

5345
/**
5446
* Zend_Controller
@@ -58,109 +50,6 @@ defined('TESTS_ZEND_CLOUD_STORAGE_WINDOWSAZURE_CONTAINER') || define('TESTS_ZEND
5850
*/
5951
defined('TESTS_ZEND_CONTROLLER_DISPATCHER_OB') || define('TESTS_ZEND_CONTROLLER_DISPATCHER_OB', false);
6052

61-
/**
62-
* Zend_Feed_Rss/Zend_Feed_Atom online tests
63-
*
64-
* Set the BASEURI to a vhost pointed at the tests/Zend/Feed/_files
65-
* subdirectory to enable these tests.
66-
*/
67-
defined('TESTS_ZEND_FEED_IMPORT_ONLINE_BASEURI') || define('TESTS_ZEND_FEED_IMPORT_ONLINE_BASEURI', false);
68-
69-
/**
70-
* Zend_Feed_Reader tests
71-
*
72-
* If the ONLINE_ENABLED property is false, only tests that can be executed
73-
* without network connectivity are run; when enabled, all tests will run.
74-
*/
75-
defined('TESTS_ZEND_FEED_READER_ONLINE_ENABLED') || define('TESTS_ZEND_FEED_READER_ONLINE_ENABLED', false);
76-
77-
/**
78-
* Zend_Gdata tests
79-
*
80-
* If the ONLINE_ENABLED property is false, only tests that can be executed with
81-
* a mock HTTP client are run. No request is sent to the Google Gdata servers.
82-
* If ONLINE_ENABLED is true, some tests may make requests to the remote
83-
* servers. This does not work if you are running tests on a disconnected
84-
* client host. Also, the tests may show as failures if the Google servers
85-
* cannot be reached or if they do not respond for another reason.
86-
*
87-
* If the CLIENTLOGIN_ENABLED property below is false, the authenticated
88-
* tests are reported Skipped in the test run. Set this property to true
89-
* to enable tests that require ClientLogin authentication. Enter your
90-
* Google login credentials in the EMAIL and PASSWORD properties below.
91-
*
92-
* Edit TestConfiguration.php, not TestConfiguration.php.dist.
93-
* Never commit plaintext passwords to the source code repository.
94-
*
95-
* Note: the GData tests currently require that the TZID env variable
96-
* be set or the timezone otherwise configured. You'll see errors from the
97-
* tests if this is not the case.
98-
*/
99-
defined('TESTS_ZEND_GDATA_ONLINE_ENABLED') || define('TESTS_ZEND_GDATA_ONLINE_ENABLED', false);
100-
defined('TESTS_ZEND_GDATA_CLIENTLOGIN_ENABLED') || define('TESTS_ZEND_GDATA_CLIENTLOGIN_ENABLED', false);
101-
102-
/*
103-
* The credentials provided here should be only for a TEST account.
104-
* Data for various services in this account may be added to, updated,
105-
* or deleted based upon the actions of these test accounts.
106-
*/
107-
defined('TESTS_ZEND_GDATA_CLIENTLOGIN_EMAIL') || define('TESTS_ZEND_GDATA_CLIENTLOGIN_EMAIL', '[email protected]');
108-
defined('TESTS_ZEND_GDATA_CLIENTLOGIN_PASSWORD') || define('TESTS_ZEND_GDATA_CLIENTLOGIN_PASSWORD', 'password');
109-
110-
/*
111-
* This is the ID of a blank blog. There is no need to have
112-
* any content in this blog. Also, blogs can only be used
113-
* several times for the purpose of these test cases before
114-
* they must be deleted and recreated. Otherwise, the tests
115-
* will start failing, as posts to Blogger will return a 201 Created
116-
* response even though the entry was not posted to the blog.
117-
* This problem is being investigated.
118-
*/
119-
defined('TESTS_ZEND_GDATA_BLOGGER_ONLINE_ENABLED') || define('TESTS_ZEND_GDATA_BLOGGER_ONLINE_ENABLED', false);
120-
defined('TESTS_ZEND_GDATA_BLOG_ID') || define('TESTS_ZEND_GDATA_BLOG_ID', '1111111111111111111');
121-
122-
/*
123-
* This is the key for a spreadsheet with data only in the first row of
124-
* the spreadsheet. The strings 'a1', 'b1', 'c1', 'd1' should be in the
125-
* corresponding cell locations.
126-
*/
127-
defined('TESTS_ZEND_GDATA_SPREADSHEETS_ONLINE_ENABLED') || define('TESTS_ZEND_GDATA_SPREADSHEETS_ONLINE_ENABLED', false);
128-
defined('TESTS_ZEND_GDATA_SPREADSHEETS_SPREADSHEETKEY') || define('TESTS_ZEND_GDATA_SPREADSHEETS_SPREADSHEETKEY', 'o01111111111111111111.1111111111111111111');
129-
defined('TESTS_ZEND_GDATA_SPREADSHEETS_WORKSHEETID') || define('TESTS_ZEND_GDATA_SPREADSHEETS_WORKSHEETID', 'default');
130-
131-
/*
132-
* This indicates that online tests for the Google Calendar API should
133-
* be performed. The default calendar will be used.
134-
*/
135-
defined('TESTS_ZEND_GDATA_CALENDAR_ONLINE_ENABLED') || define('TESTS_ZEND_GDATA_CALENDAR_ONLINE_ENABLED', false);
136-
137-
/*
138-
* This is the fully-qualified domain name for a domiain hosted using
139-
* Google Apps. This domain must be registered with Google Apps and
140-
* have API access enabled. This should be a TEST domain only.
141-
*/
142-
defined('TESTS_ZEND_GDATA_GAPPS_ONLINE_ENABLED') || define('TESTS_ZEND_GDATA_GAPPS_ONLINE_ENABLED', false);
143-
defined('TESTS_ZEND_GDATA_GAPPS_DOMAIN') || define('TESTS_ZEND_GDATA_GAPPS_DOMAIN', 'example.com.invalid');
144-
defined('TESTS_ZEND_GDATA_GAPPS_EMAIL') || define('TESTS_ZEND_GDATA_GAPPS_EMAIL', '[email protected]');
145-
defined('TESTS_ZEND_GDATA_GAPPS_PASSWORD') || define('TESTS_ZEND_GDATA_GAPPS_PASSWORD', 'password');
146-
147-
/*
148-
* This indicates that online tests for the Books Search data API
149-
* should be performed.
150-
*/
151-
defined('TESTS_ZEND_GDATA_BOOKS_ONLINE_ENABLED') || define('TESTS_ZEND_GDATA_BOOKS_ONLINE_ENABLED', false);
152-
153-
/*
154-
* This indicates that online tests for the Google Documents API should
155-
* be performed.
156-
*/
157-
defined('TESTS_ZEND_GDATA_DOCS_ONLINE_ENABLED') || define('TESTS_ZEND_GDATA_DOCS_ONLINE_ENABLED', false);
158-
159-
/*
160-
* This indicates that online tests for the GData Photos API should
161-
* be performed.
162-
*/
163-
defined('TESTS_ZEND_GDATA_PHOTOS_ONLINE_ENABLED') || define('TESTS_ZEND_GDATA_PHOTOS_ONLINE_ENABLED', false);
16453

16554
/**
16655
* Zend_Loader_Autoloader multi-version support tests
@@ -228,27 +117,6 @@ defined('TESTS_ZEND_LOCALE_FORMAT_SETLOCALE') || define('TESTS_ZEND_LOCALE_FORMA
228117
*/
229118
defined('TESTS_ZEND_LOCALE_BCMATH_ENABLED') || define('TESTS_ZEND_LOCALE_BCMATH_ENABLED', true);
230119

231-
/**
232-
* Zend_Rest tests
233-
*/
234-
defined('TESTS_ZEND_REST_ONLINE_ENABLED') || define('TESTS_ZEND_REST_ONLINE_ENABLED', false);
235-
236-
237-
/**
238-
* Zend_Serializer adapter tests
239-
*
240-
* TESTS_ZEND_SERIALIZER_ADAPTER_WDDX_ENABLED:
241-
* - enable wddx adapter tests
242-
* - needs wddx and SimpleXml php extension installed
243-
*
244-
* TESTS_ZEND_SERIALIZER_ADAPTER_IGBINARY_ENABLED:
245-
* - enable igbinary adapter tests
246-
* - needs igbinary php extension installed
247-
*/
248-
defined('TESTS_ZEND_SERIALIZER_ADAPTER_WDDX_ENABLED') || define('TESTS_ZEND_SERIALIZER_ADAPTER_WDDX_ENABLED', false);
249-
defined('TESTS_ZEND_SERIALIZER_ADAPTER_IGBINARY_ENABLED') || define('TESTS_ZEND_SERIALIZER_ADAPTER_IGBINARY_ENABLED', false);
250-
251-
252120
/**
253121
* Zend_Uri tests
254122
*
@@ -260,15 +128,6 @@ defined('TESTS_ZEND_SERIALIZER_ADAPTER_IGBINARY_ENABLED') || define('TESTS_ZEND_
260128
*/
261129
defined('TESTS_ZEND_URI_CRASH_TEST_ENABLED') || define('TESTS_ZEND_URI_CRASH_TEST_ENABLED', false);
262130

263-
/**
264-
* Zend_Version tests
265-
*
266-
* Set ONLINE_ENABLED if you wish to run validators that require network
267-
* connectivity.
268-
*/
269-
defined('TESTS_ZEND_VERSION_ONLINE_ENABLED') || define('TESTS_ZEND_VERSION_ONLINE_ENABLED', false);
270-
271-
272131
/**
273132
* Zend_Validate tests
274133
*

tests/TestHelper.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
*/
2020

2121
// Set error reporting to the level to which Zend Framework code must comply.
22-
error_reporting(E_ALL | E_STRICT);
22+
error_reporting(E_ALL);
2323

2424
/*
2525
* Determine the root, library, and tests directories of the framework

0 commit comments

Comments
 (0)