EZP-31542: Added PHP 7.4 support (eZ Platform 2.5)

.travis.yml

@@ -53,6 +53,20 @@ matrix:
     - name: 'Code Style Check'
       php: 7.3
       env: CHECK_CS=1
+# 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"
+
 
 # test only master, stable branches and pull requests
 branches:

eZ/Bundle/EzPublishCoreBundle/Tests/Assetic/AssetFactoryTest.php

@@ -36,10 +36,13 @@ protected function setUp()
 
     protected function getAssetFactory()
     {
+        $parameterBag = $this->createMock(ParameterBagInterface::class);
+        $parameterBag->method('resolveValue')->willReturnArgument(0);
+
         $assetFactory = new AssetFactory(
             $this->createMock(KernelInterface::class),
             $this->createMock(ContainerInterface::class),
-            $this->createMock(ParameterBagInterface::class),
+            $parameterBag,
             '/root/dir/'
         );
         $assetFactory->setConfigResolver($this->configResolver);

eZ/Publish/API/Repository/Tests/FieldType/SearchBaseIntegrationTest.php

@@ -1251,7 +1251,7 @@ public function sortProvider()
 
         foreach ($additionalFields as $additionalField) {
             foreach ($templates as $template) {
-                $template[] = $additionalField[0];
+                $template[] = $additionalField[0] ?? null;
                 $fixture[] = $template;
             }
         }

eZ/Publish/Core/FieldType/BinaryFile/SearchField.php

@@ -31,17 +31,17 @@ public function getIndexData(Field $field, FieldDefinition $fieldDefinition)
         return [
             new Search\Field(
                 'file_name',
-                $field->value->externalData['fileName'],
+                $field->value->externalData['fileName'] ?? null,
                 new Search\FieldType\StringField()
             ),
             new Search\Field(
                 'file_size',
-                $field->value->externalData['fileSize'],
+                $field->value->externalData['fileSize'] ?? null,
                 new Search\FieldType\IntegerField()
             ),
             new Search\Field(
                 'mime_type',
-                $field->value->externalData['mimeType'],
+                $field->value->externalData['mimeType'] ?? null,
                 new Search\FieldType\StringField()
             ),
         ];

eZ/Publish/Core/FieldType/DateAndTime/SearchField.php

@@ -31,7 +31,7 @@ public function getIndexData(Field $field, FieldDefinition $fieldDefinition)
         return [
             new Search\Field(
                 'value',
-                $field->value->data['timestamp'],
+                $field->value->data['timestamp'] ?? null,
                 new Search\FieldType\DateField()
             ),
         ];

eZ/Publish/Core/FieldType/Image/SearchField.php

@@ -31,22 +31,22 @@ public function getIndexData(Field $field, FieldDefinition $fieldDefinition)
         return [
             new Search\Field(
                 'filename',
-                $field->value->data['fileName'],
+                $field->value->data['fileName'] ?? null,
                 new Search\FieldType\StringField()
             ),
             new Search\Field(
                 'alternative_text',
-                $field->value->data['alternativeText'],
+                $field->value->data['alternativeText'] ?? null,
                 new Search\FieldType\StringField()
             ),
             new Search\Field(
                 'file_size',
-                $field->value->data['fileSize'],
+                $field->value->data['fileSize'] ?? null,
                 new Search\FieldType\IntegerField()
             ),
             new Search\Field(
                 'mime_type',
-                $field->value->data['mime'],
+                $field->value->data['mime'] ?? null,
                 new Search\FieldType\StringField()
             ),
         ];

eZ/Publish/Core/FieldType/MapLocation/SearchField.php

@@ -31,20 +31,20 @@ public function getIndexData(Field $field, FieldDefinition $fieldDefinition)
         return [
             new Search\Field(
                 'value_address',
-                $field->value->externalData['address'],
+                $field->value->externalData['address'] ?? null,
                 new Search\FieldType\StringField()
             ),
             new Search\Field(
                 'value_location',
                 [
-                    'latitude' => $field->value->externalData['latitude'],
-                    'longitude' => $field->value->externalData['longitude'],
+                    'latitude' => $field->value->externalData['latitude'] ?? null,
+                    'longitude' => $field->value->externalData['longitude'] ?? null,
                 ],
                 new Search\FieldType\GeoLocationField()
             ),
             new Search\Field(
                 'fulltext',
-                $field->value->externalData['address'],
+                $field->value->externalData['address'] ?? null,
                 new Search\FieldType\FullTextField()
             ),
         ];

eZ/Publish/Core/FieldType/Media/SearchField.php

@@ -31,17 +31,17 @@ public function getIndexData(Field $field, FieldDefinition $fieldDefinition)
         return [
             new Search\Field(
                 'file_name',
-                $field->value->externalData['fileName'],
+                $field->value->externalData['fileName'] ?? null,
                 new Search\FieldType\StringField()
             ),
             new Search\Field(
                 'file_size',
-                $field->value->externalData['fileSize'],
+                $field->value->externalData['fileSize'] ?? null,
                 new Search\FieldType\IntegerField()
             ),
             new Search\Field(
                 'mime_type',
-                $field->value->externalData['mimeType'],
+                $field->value->externalData['mimeType'] ?? null,
                 new Search\FieldType\StringField()
             ),
         ];

eZ/Publish/Core/FieldType/Relation/Type.php

@@ -222,7 +222,14 @@ protected function getSortInfo(BaseValue $value)
      */
     public function fromHash($hash)
     {
-        return new Value($hash['destinationContentId']);
+        if ($hash !== null) {
+            $destinationContentId = $hash['destinationContentId'];
+            if ($destinationContentId !== null) {
+                return new Value((int)$destinationContentId);
+            }
+        }
+
+        return $this->getEmptyValue();
     }
 
     /**

eZ/Publish/Core/FieldType/Tests/Url/UrlStorageTest.php

@@ -97,7 +97,7 @@ public function testStoreFieldDataWithEmptyUrl()
         $result = $storage->storeFieldData($versionInfo, $field, $this->getContext());
 
         $this->assertFalse($result);
-        $this->assertNull($field->value->data['urlId']);
+        $this->assertNull($field->value->data);
     }
 
     public function testGetFieldData()

eZ/Publish/Core/Persistence/Legacy/Content/FieldValue/Converter/AuthorConverter.php

@@ -65,7 +65,11 @@ public function toFieldValue(StorageFieldValue $value, FieldValue $fieldValue)
      */
     public function toStorageFieldDefinition(FieldDefinition $fieldDef, StorageFieldDefinition $storageDef)
     {
-        $storageDef->dataInt1 = (int)$fieldDef->fieldTypeConstraints->fieldSettings['defaultAuthor'];
+        $fieldSettings = $fieldDef->fieldTypeConstraints->fieldSettings;
+
+        if ($fieldSettings !== null) {
+            $storageDef->dataInt1 = (int)$fieldSettings['defaultAuthor'];
+        }
     }
 
     /**

eZ/Publish/Core/Persistence/Legacy/Content/FieldValue/Converter/DateAndTimeConverter.php

@@ -77,13 +77,16 @@ public function toFieldValue(StorageFieldValue $value, FieldValue $fieldValue)
      */
     public function toStorageFieldDefinition(FieldDefinition $fieldDef, StorageFieldDefinition $storageDef)
     {
-        $storageDef->dataInt2 = $fieldDef->fieldTypeConstraints->fieldSettings['useSeconds'] ? 1 : 0;
-        $storageDef->dataInt1 = $fieldDef->fieldTypeConstraints->fieldSettings['defaultType'];
+        $fieldSettings = $fieldDef->fieldTypeConstraints->fieldSettings;
+        if ($fieldSettings === null) {
+            return;
+        }
+
+        $storageDef->dataInt2 = $fieldSettings['useSeconds'] ? 1 : 0;
+        $storageDef->dataInt1 = $fieldSettings['defaultType'];
 
-        if ($fieldDef->fieldTypeConstraints->fieldSettings['defaultType'] === DateAndTimeType::DEFAULT_CURRENT_DATE_ADJUSTED) {
-            $storageDef->dataText5 = $this->generateDateIntervalXML(
-                $fieldDef->fieldTypeConstraints->fieldSettings['dateInterval']
-            );
+        if ($fieldSettings['defaultType'] === DateAndTimeType::DEFAULT_CURRENT_DATE_ADJUSTED) {
+            $storageDef->dataText5 = $this->generateDateIntervalXML($fieldSettings['dateInterval']);
         }
     }
 

eZ/Publish/Core/Persistence/Legacy/Content/FieldValue/Converter/DateConverter.php

@@ -74,7 +74,7 @@ public function toFieldValue(StorageFieldValue $value, FieldValue $fieldValue)
      */
     public function toStorageFieldDefinition(FieldDefinition $fieldDef, StorageFieldDefinition $storageDef)
     {
-        $storageDef->dataInt1 = $fieldDef->fieldTypeConstraints->fieldSettings['defaultType'];
+        $storageDef->dataInt1 = $fieldDef->fieldTypeConstraints->fieldSettings['defaultType'] ?? null;
     }
 
     /**

eZ/Publish/Core/Persistence/Legacy/Content/FieldValue/Converter/TimeConverter.php

@@ -72,8 +72,12 @@ public function toFieldValue(StorageFieldValue $value, FieldValue $fieldValue)
      */
     public function toStorageFieldDefinition(FieldDefinition $fieldDef, StorageFieldDefinition $storageDef)
     {
-        $storageDef->dataInt1 = $fieldDef->fieldTypeConstraints->fieldSettings['defaultType'];
-        $storageDef->dataInt2 = $fieldDef->fieldTypeConstraints->fieldSettings['useSeconds'] ? 1 : 0;
+        $fieldSettings = $fieldDef->fieldTypeConstraints->fieldSettings;
+
+        if ($fieldSettings !== null) {
+            $storageDef->dataInt1 = $fieldSettings['defaultType'];
+            $storageDef->dataInt2 = $fieldSettings['useSeconds'] ? 1 : 0;
+        }
     }
 
     /**

eZ/Publish/Core/Persistence/Legacy/Tests/Content/ContentHandlerTest.php

@@ -253,7 +253,15 @@ public function testPublishFirstVersion()
             ->with(23, 1)
             ->will(
                 $this->returnValue(
-                    new VersionInfo(['contentInfo' => new ContentInfo(['currentVersionNo' => 1])])
+                    new VersionInfo([
+                        'contentInfo' => new ContentInfo([
+                            'currentVersionNo' => 1,
+                            'mainLanguageCode' => 'eng-GB',
+                        ]),
+                        'names' => [
+                            'eng-GB' => '',
+                        ],
+                    ])
                 )
             );
 
@@ -325,7 +333,15 @@ public function testPublish()
             ->with(23, 2)
             ->will(
                 $this->returnValue(
-                    new VersionInfo(['contentInfo' => new ContentInfo(['currentVersionNo' => 1])])
+                    new VersionInfo([
+                        'contentInfo' => new ContentInfo([
+                            'currentVersionNo' => 1,
+                            'mainLanguageCode' => 'eng-GB',
+                        ]),
+                        'names' => [
+                            'eng-GB' => '',
+                        ],
+                    ])
                 )
             );
 

eZ/Publish/Core/Persistence/TransformationProcessor/PcreCompiler.php

@@ -198,7 +198,7 @@ protected function getModuloCharRange($start, $end, $modulo)
      */
     protected function getTransposeClosure($operator, $value)
     {
-        $value = hexdec($value) * ($operator === '-' ? -1 : 1);
+        $value = $this->hexdec($value) * ($operator === '-' ? -1 : 1);
         $converter = $this->converter;
 
         return function ($matches) use ($value, $converter) {
@@ -273,4 +273,18 @@ protected function compileCharacter($char)
                 throw new RuntimeException("Invalid character definition: $char");
         }
     }
+
+    /**
+     * Converts a hexadecimal string to a decimal number.
+     *
+     * In compare to standard hexdec function it will ignore any non-hexadecimal characters
+     */
+    private function hexdec(?string $value): int
+    {
+        if ($value === null) {
+            return 0;
+        }
+
+        return hexdec(preg_replace('/[^[:xdigit:]]/', '', (string)$value));
+    }
 }

eZ/Publish/Core/Repository/Tests/Service/Mock/UserPreferenceTest.php

@@ -33,12 +33,10 @@ protected function setUp()
         $this->userSPIPreferenceHandler = $this->getPersistenceMockHandler('UserPreference\\Handler');
         $permissionResolverMock = $this->createMock(PermissionResolver::class);
         $permissionResolverMock
-            ->expects($this->atLeastOnce())
             ->method('getCurrentUserReference')
             ->willReturn(new UserReference(self::CURRENT_USER_ID));
         $repository = $this->getRepositoryMock();
         $repository
-            ->expects($this->atLeastOnce())
             ->method('getPermissionResolver')
             ->willReturn($permissionResolverMock);
     }

eZ/Publish/Core/Repository/UserPreferenceService.php

@@ -62,22 +62,27 @@ public function setUserPreference(array $userPreferenceSetStructs): void
     {
         $spiSetStructs = [];
         foreach ($userPreferenceSetStructs as $key => $userPreferenceSetStruct) {
-            $spiSetStruct = new UserPreferenceSetStruct();
-            $spiSetStruct->userId = $this->getCurrentUserId();
-
             if (empty($userPreferenceSetStruct->name)) {
                 throw new InvalidArgumentException('name', $userPreferenceSetStruct->name . ' at index ' . $key);
             }
 
-            $spiSetStruct->name = $userPreferenceSetStruct->name;
+            $value = $userPreferenceSetStruct->value;
+
+            if (is_object($value) && !method_exists($value, '__toString')) {
+                throw new InvalidArgumentException('value', 'Cannot convert value to string at index ' . $key);
+            }
 
             try {
                 $value = (string)$userPreferenceSetStruct->value;
             } catch (\Exception $exception) {
                 throw new InvalidArgumentException('value', 'Can not convert value to string at index ' . $key);
             }
 
+            $spiSetStruct = new UserPreferenceSetStruct();
+            $spiSetStruct->userId = $this->getCurrentUserId();
+            $spiSetStruct->name = $userPreferenceSetStruct->name;
             $spiSetStruct->value = $value;
+
             $spiSetStructs[] = $spiSetStruct;
         }