-
Notifications
You must be signed in to change notification settings - Fork 203
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
EZP-31542: Added PHP 7.4 support (eZ Platform 2.5) #3017
Conversation
…n \eZ\Publish\Core\FieldType\Tests\Url\UrlStorageTest::testStoreFieldDataWithEmptyUrl
…in \eZ\Publish\Core\Persistence\Legacy\Tests\Content\ContentHandlerTest::{testPublishFirstVersion,testPublish}
…n \eZ\Publish\Core\FieldType\Relation\Type::fromHash
…n \eZ\Publish\Core\FieldType\{BinaryFile,DateAndTime,MapLocation}\SearchField
…n \eZ\Publish\Core\Persistence\Legacy\Content\FieldValue\Converter\{Author,DateAndTime,Date,Time}Converter
…n \eZ\Publish\API\Repository\Tests\FieldType\SearchBaseIntegrationTest::sortProvider
…null" in \eZ\Publish\Core\Persistence\Legacy\Content\FieldValue\Converter\{Author,DateAndTime,Date,Time}Converter
…tSetUserPreferenceThrowsInvalidArgumentExceptionOnInvalidValue
…" when invoked at least once." in eZ\Publish\Core\Repository\Tests\Service\Mock\UserPreferenceTest::testSetUserPreferenceThrowsInvalidArgumentException
…n \eZ\Publish\Core\FieldType\Image\SearchField::getIndexData
…n \eZ\Publish\Core\FieldType\Media\SearchField::getIndexData
…n \eZ\Bundle\EzPublishCoreBundle\Tests\Assetic\AssetFactoryTest
eZ/Publish/Core/Persistence/Legacy/Content/FieldValue/Converter/DateAndTimeConverter.php
Show resolved
Hide resolved
eZ/Publish/Core/Persistence/TransformationProcessor/PcreCompiler.php
Outdated
Show resolved
Hide resolved
…er.php Co-Authored-By: Andrew Longosz <alongosz@users.noreply.github.com>
.travis.yml
Outdated
# 7.4 | ||
- php: 7.4 | ||
env: TEST_CONFIG="phpunit.xml" | ||
- php: 7.4 | ||
env: PHP_IMAGE=ezsystems/php:7.4-v1 PHP_IMAGE_DEV=ezsystems/php:7.4-v1-dev REST_TEST_CONFIG="phpunit-functional-rest.xml" SYMFONY_ENV=behat SYMFONY_DEBUG=1 SF_CMD="ez:behat:create-language 'pol-PL' 'Polish (polski)'" | ||
- php: 7.4 | ||
env: PHP_IMAGE=ezsystems/php:7.4-v1 PHP_IMAGE_DEV=ezsystems/php:7.4-v1-dev BEHAT_OPTS="--profile=rest --tags=~@broken --suite=fullJson" SYMFONY_ENV=behat SYMFONY_DEBUG=1 | ||
- php: 7.4 | ||
env: SOLR_VERSION="6.4.2" TEST_CONFIG="phpunit-integration-legacy-solr.xml" CUSTOM_CACHE_POOL="singleredis" CORES_SETUP="shared" SOLR_CONFIG="vendor/ezsystems/ezplatform-solr-search-engine/lib/Resources/config/solr/schema.xml vendor/ezsystems/ezplatform-solr-search-engine/lib/Resources/config/solr/custom-fields-types.xml vendor/ezsystems/ezplatform-solr-search-engine/lib/Resources/config/solr/language-fieldtypes.xml" JAVA_HOME="/usr/lib/jvm/java-8-openjdk-amd64/jre/" | ||
- php: 7.4 | ||
env: TEST_CONFIG="phpunit-integration-legacy.xml" DB="postgresql" DATABASE="pgsql://postgres@localhost/testdb" | ||
- php: 7.4 | ||
env: TEST_CONFIG="phpunit-integration-legacy.xml" DB="mysql" DATABASE="mysql://root@localhost/testdb" | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Lets reduce number of tests here, it will take a long time to wait for them all to pass. We don't necerly need to test everything (3 flavours of integration test runs) on 7.4 once we have now gotten past to make sure all tests pass.
# 7.4 | |
- php: 7.4 | |
env: TEST_CONFIG="phpunit.xml" | |
- php: 7.4 | |
env: PHP_IMAGE=ezsystems/php:7.4-v1 PHP_IMAGE_DEV=ezsystems/php:7.4-v1-dev REST_TEST_CONFIG="phpunit-functional-rest.xml" SYMFONY_ENV=behat SYMFONY_DEBUG=1 SF_CMD="ez:behat:create-language 'pol-PL' 'Polish (polski)'" | |
- php: 7.4 | |
env: PHP_IMAGE=ezsystems/php:7.4-v1 PHP_IMAGE_DEV=ezsystems/php:7.4-v1-dev BEHAT_OPTS="--profile=rest --tags=~@broken --suite=fullJson" SYMFONY_ENV=behat SYMFONY_DEBUG=1 | |
- php: 7.4 | |
env: SOLR_VERSION="6.4.2" TEST_CONFIG="phpunit-integration-legacy-solr.xml" CUSTOM_CACHE_POOL="singleredis" CORES_SETUP="shared" SOLR_CONFIG="vendor/ezsystems/ezplatform-solr-search-engine/lib/Resources/config/solr/schema.xml vendor/ezsystems/ezplatform-solr-search-engine/lib/Resources/config/solr/custom-fields-types.xml vendor/ezsystems/ezplatform-solr-search-engine/lib/Resources/config/solr/language-fieldtypes.xml" JAVA_HOME="/usr/lib/jvm/java-8-openjdk-amd64/jre/" | |
- php: 7.4 | |
env: TEST_CONFIG="phpunit-integration-legacy.xml" DB="postgresql" DATABASE="pgsql://postgres@localhost/testdb" | |
- php: 7.4 | |
env: TEST_CONFIG="phpunit-integration-legacy.xml" DB="mysql" DATABASE="mysql://root@localhost/testdb" | |
# 7.4 | |
- php: 7.4 | |
env: TEST_CONFIG="phpunit.xml" | |
- php: 7.4 | |
env: PHP_IMAGE=ezsystems/php:7.4-v1 PHP_IMAGE_DEV=ezsystems/php:7.4-v1-dev REST_TEST_CONFIG="phpunit-functional-rest.xml" SYMFONY_ENV=behat SYMFONY_DEBUG=1 SF_CMD="ez:behat:create-language 'pol-PL' 'Polish (polski)'" | |
- php: 7.4 | |
env: PHP_IMAGE=ezsystems/php:7.4-v1 PHP_IMAGE_DEV=ezsystems/php:7.4-v1-dev BEHAT_OPTS="--profile=rest --tags=~@broken --suite=fullJson" SYMFONY_ENV=behat SYMFONY_DEBUG=1 | |
- php: 7.4 | |
env: SOLR_VERSION="7.7.2" TEST_CONFIG="phpunit-integration-legacy-solr.xml" CORES_SETUP="shared" SOLR_CONFIG="vendor/ezsystems/ezplatform-solr-search-engine/lib/Resources/config/solr/schema.xml vendor/ezsystems/ezplatform-solr-search-engine/lib/Resources/config/solr/custom-fields-types.xml vendor/ezsystems/ezplatform-solr-search-engine/lib/Resources/config/solr/language-fieldtypes.xml" JAVA_HOME="/usr/lib/jvm/java-8-openjdk-amd64/jre/" | |
- php: 7.4 | |
env: TEST_CONFIG="phpunit-integration-legacy.xml" DB="mysql" DATABASE="mysql://root@localhost/testdb" CUSTOM_CACHE_POOL="singleredis" | |
Note! I'm suggesting we test Solr 7 here on PHP 7.4. probably need adaptions in integration test script to pull in solr bundle 2.x when solr 7 is asked for.
# 7.1
- php: 7.1
env: TEST_CONFIG="phpunit.xml"
- php: 7.1
env: PHP_IMAGE=ezsystems/php:7.1-v1 PHP_IMAGE_DEV=ezsystems/php:7.1-v1-dev REST_TEST_CONFIG="phpunit-functional-rest.xml" SYMFONY_ENV=behat SYMFONY_DEBUG=1 SF_CMD="ez:behat:create-language 'pol-PL' 'Polish (polski)'"
- php: 7.1
env: PHP_IMAGE=ezsystems/php:7.1-v1 PHP_IMAGE_DEV=ezsystems/php:7.1-v1-dev BEHAT_OPTS="--profile=rest --tags=~@broken --suite=fullJson" SYMFONY_ENV=behat SYMFONY_DEBUG=1
- php: 7.1
- env: SOLR_VERSION="6.4.2" TEST_CONFIG="phpunit-integration-legacy-solr.xml" CUSTOM_CACHE_POOL="singleredis" CORES_SETUP="shared" SOLR_CONFIG="vendor/ezsystems/ezplatform-solr-search-engine/lib/Resources/config/solr/schema.xml vendor/ezsystems/ezplatform-solr-search-engine/lib/Resources/config/solr/custom-fields-types.xml vendor/ezsystems/ezplatform-solr-search-engine/lib/Resources/config/solr/language-fieldtypes.xml" JAVA_HOME="/usr/lib/jvm/java-8-openjdk-amd64/jre/"
+ env: SOLR_VERSION="6.6.5" TEST_CONFIG="phpunit-integration-legacy-solr.xml" CUSTOM_CACHE_POOL="singleredis" CORES_SETUP="shared" SOLR_CONFIG="vendor/ezsystems/ezplatform-solr-search-engine/lib/Resources/config/solr/schema.xml vendor/ezsystems/ezplatform-solr-search-engine/lib/Resources/config/solr/custom-fields-types.xml vendor/ezsystems/ezplatform-solr-search-engine/lib/Resources/config/solr/language-fieldtypes.xml" JAVA_HOME="/usr/lib/jvm/java-8-openjdk-amd64/jre/"
- php: 7.1
env: TEST_CONFIG="phpunit-integration-legacy.xml" DB="postgresql" DATABASE="pgsql://postgres@localhost/testdb"
- - php: 7.1
- env: TEST_CONFIG="phpunit-integration-legacy.xml" DB="mysql" DATABASE="mysql://root@localhost/testdb"
Could also consider to split the functional testing across 7.1 and 7.4 as opposed to run both on both php versions.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sure, number of jobs will be reduced before merge. Right now I needed them to make sure that everything works 😉
@@ -222,7 +222,14 @@ protected function getSortInfo(BaseValue $value) | |||
*/ | |||
public function fromHash($hash) | |||
{ | |||
return new Value($hash['destinationContentId']); | |||
if ($hash !== null) { | |||
$destinationContentId = $hash['destinationContentId']; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
maybe this should also use ?? null
to get the destinationContentId
?
7.x
TODO:
$ composer fix-cs
).