Merge branch 'develop' into php-maintainance

Author: jenschude

.github/workflows/ci.yml

@@ -90,6 +90,7 @@ jobs:
           - "7.3"
           - "7.4"
           - "8.0"
+          - "8.1"
 
         dependencies:
           - lowest

composer.json

@@ -42,9 +42,9 @@
   },
   "require-dev": {
     "guzzlehttp/guzzle": "^7.0 || ^6.0",
-    "phpunit/phpunit": "^9.0",
+    "phpunit/phpunit": "9.5.10",
     "phpspec/prophecy-phpunit": "^2.0",
-    "symplify/easy-coding-standard-prefixed": "8.3.48 || 9.2.23",
+    "symplify/easy-coding-standard": "10.0.2",
     "doctrine/cache": "^1.6 || ^2.0",
     "monolog/monolog": "^1.12 || ^2.0",
     "symfony/yaml": "^4.0 || ^3.4.38 || ^5.0",

src/Core/Helper/Annotate/AnnotationGenerator.php

@@ -92,7 +92,7 @@ protected function getJsonObjects(\RegexIterator $phpFiles)
         $jsonObjects = [];
         foreach ($phpFiles as $phpFile) {
             $class = $this->getClassName($phpFile->getRealPath());
-            if (strpos($class, 'Core\\Helper') > 0) {
+            if ($class != null && strpos($class, 'Core\\Helper') > 0) {
                 continue;
             }
 
@@ -112,7 +112,7 @@ protected function getCollectionObjects(\RegexIterator $phpFiles)
         $collectionObjects = [];
         foreach ($phpFiles as $phpFile) {
             $class = $this->getClassName($phpFile->getRealPath());
-            if (strpos($class, 'Core\\Helper') > 0) {
+            if ($class != null && strpos($class, 'Core\\Helper') > 0) {
                 continue;
             }
 
@@ -132,7 +132,7 @@ protected function getRequestObjects(\RegexIterator $phpFiles)
         $requestObjects = [];
         foreach ($phpFiles as $phpFile) {
             $class = $this->getClassName($phpFile->getRealPath());
-            if (strpos($class, 'Core\\Helper') > 0) {
+            if ($class != null && strpos($class, 'Core\\Helper') > 0) {
                 continue;
             }
 
@@ -152,7 +152,7 @@ protected function getRequestDomainObjects(\RegexIterator $phpFiles)
         $requestObjects = [];
         foreach ($phpFiles as $phpFile) {
             $class = $this->getClassName($phpFile->getRealPath());
-            if (strpos($class, 'Core\\Helper') > 0) {
+            if ($class != null && strpos($class, 'Core\\Helper') > 0) {
                 continue;
             }
 
@@ -164,10 +164,10 @@ protected function getRequestDomainObjects(\RegexIterator $phpFiles)
                 ) {
                     $namespaceParts = explode("\\", $class->getNamespaceName());
                     $domain = $namespaceParts[count($namespaceParts) - 1];
-                    if (strpos($class, 'ProductProjection') > 0) {
+                    if ($class != null && strpos($class, 'ProductProjection') > 0) {
                         $domain = 'ProductProjections';
                     }
-                    if (strpos($class, 'ProductsSuggest') > 0) {
+                    if ($class != null && strpos($class, 'ProductsSuggest') > 0) {
                         $domain = 'ProductProjections';
                     }
                     $requestObjects[$domain][] = $class->getName();
@@ -183,7 +183,7 @@ protected function getUpdateObjects(\RegexIterator $phpFiles)
         $actions = [];
         foreach ($phpFiles as $phpFile) {
             $class = $this->getClassName($phpFile->getRealPath());
-            if (strpos($class, 'Core\\Helper') > 0) {
+            if ($class != null && strpos($class, 'Core\\Helper') > 0) {
                 continue;
             }
 

src/Core/Model/Common/AbstractJsonDeserializeObject.php

@@ -173,6 +173,7 @@ protected function getRaw($field, $default = null)
         return isset($this->rawData[$field])? $this->rawData[$field]: $default;
     }
 
+    #[\ReturnTypeWillChange]
     /**
      * (PHP 5 &gt;= 5.4.0)<br/>
      * Specify data which should be serialized to JSON

src/Core/Model/Common/Collection.php

@@ -225,6 +225,7 @@ public function setAt($offset, $object)
         return $this;
     }
 
+    #[\ReturnTypeWillChange]
     /**
      * (PHP 5 &gt;= 5.1.0)<br/>
      * Count elements of an object
@@ -244,6 +245,7 @@ public function count()
     }
 
 
+    #[\ReturnTypeWillChange]
     /**
      * (PHP 5 &gt;= 5.0.0)<br/>
      * Return the current element
@@ -258,6 +260,7 @@ public function current()
         return null;
     }
 
+    #[\ReturnTypeWillChange]
     /**
      * (PHP 5 &gt;= 5.0.0)<br/>
      * Move forward to next element
@@ -269,6 +272,7 @@ public function next()
         $this->pos++;
     }
 
+    #[\ReturnTypeWillChange]
     /**
      * (PHP 5 &gt;= 5.0.0)<br/>
      * Return the key of the current element
@@ -283,6 +287,7 @@ public function key()
         return null;
     }
 
+    #[\ReturnTypeWillChange]
     /**
      * (PHP 5 &gt;= 5.0.0)<br/>
      * Checks if current position is valid
@@ -298,6 +303,7 @@ public function valid()
         return false;
     }
 
+    #[\ReturnTypeWillChange]
     /**
      * (PHP 5 &gt;= 5.0.0)<br/>
      * Rewind the Iterator to the first element
@@ -309,6 +315,7 @@ public function rewind()
         $this->pos = 0;
     }
 
+    #[\ReturnTypeWillChange]
     /**
      * (PHP 5 &gt;= 5.0.0)<br/>
      * Whether a offset exists
@@ -326,6 +333,7 @@ public function offsetExists($offset)
         return isset($this->rawData[$offset]) || isset($this->typeData[$offset]);
     }
 
+    #[\ReturnTypeWillChange]
     /**
      * (PHP 5 &gt;= 5.0.0)<br/>
      * Offset to retrieve
@@ -340,6 +348,7 @@ public function offsetGet($offset)
         return $this->getAt($offset);
     }
 
+    #[\ReturnTypeWillChange]
     /**
      * (PHP 5 &gt;= 5.0.0)<br/>
      * Offset to set
@@ -357,6 +366,7 @@ public function offsetSet($offset, $value)
         $this->setAt($offset, $value);
     }
 
+    #[\ReturnTypeWillChange]
     /**
      * (PHP 5 &gt;= 5.0.0)<br/>
      * Offset to unset

src/Core/Model/Common/Context.php

@@ -198,6 +198,7 @@ public static function of()
         return new static();
     }
 
+    #[\ReturnTypeWillChange]
     /**
      * @inheritDoc
      */
@@ -206,6 +207,7 @@ public function offsetExists($offset)
         return isset($this->$offset);
     }
 
+    #[\ReturnTypeWillChange]
     /**
      * @inheritDoc
      */
@@ -219,6 +221,7 @@ public function offsetGet($offset)
         return null;
     }
 
+    #[\ReturnTypeWillChange]
     /**
      * @inheritDoc
      */
@@ -231,6 +234,7 @@ public function offsetSet($offset, $value)
         }
     }
 
+    #[\ReturnTypeWillChange]
     /**
      * @inheritDoc
      */

src/Core/Model/Common/DateTimeDecorator.php

@@ -56,6 +56,7 @@ public function getUtcDateTime()
         return $dateTime;
     }
 
+    #[\ReturnTypeWillChange]
     /**
      * @return string
      */

src/Core/Model/Common/LocalizedString.php

@@ -136,6 +136,7 @@ public function toArray()
         return $data;
     }
 
+    #[\ReturnTypeWillChange]
     /**
      * @return array
      */

src/Core/Response/PagedQueryResponse.php

@@ -84,6 +84,7 @@ public function getResults()
     }
 
 
+    #[\ReturnTypeWillChange]
     /**
      * (PHP 5 &gt;= 5.0.0)<br/>
      * Retrieve an external iterator
@@ -97,6 +98,7 @@ public function getIterator()
         return new \ArrayIterator($this->results);
     }
 
+    #[\ReturnTypeWillChange]
     /**
      * (PHP 5 &gt;= 5.0.0)<br/>
      * Whether a offset exists
@@ -115,6 +117,7 @@ public function offsetExists($offset)
         return isset($results[$offset]);
     }
 
+    #[\ReturnTypeWillChange]
     /**
      * (PHP 5 &gt;= 5.0.0)<br/>
      * Offset to retrieve
@@ -130,6 +133,7 @@ public function offsetGet($offset)
         return $results[$offset];
     }
 
+    #[\ReturnTypeWillChange]
     /**
      * (PHP 5 &gt;= 5.0.0)<br/>
      * Offset to set
@@ -152,6 +156,7 @@ public function offsetSet($offset, $value)
         }
     }
 
+    #[\ReturnTypeWillChange]
     /**
      * (PHP 5 &gt;= 5.0.0)<br/>
      * Offset to unset

tests/unit/Builder/Update/GenericActionBuilderTest.php

@@ -33,7 +33,7 @@ public function getActionClasses()
         $actions = [];
         foreach ($phpFiles as $phpFile) {
             $class = $this->getClassName($phpFile->getRealPath());
-            if (strpos($class, 'Core\\Helper') > 0) {
+            if ($class != null && strpos($class, 'Core\\Helper') > 0) {
                 continue;
             }