IBX-8121: Fixed code style for 5.0

composer.json

@@ -30,11 +30,10 @@
         "twig/twig": "^3.0"
     },
     "require-dev": {
-        "friendsofphp/php-cs-fixer": "^3.0",
-        "ibexa/code-style": "^1.0",
+        "ibexa/code-style": "~2.0.0",
         "ibexa/doctrine-schema": "~5.0.x-dev",
         "mikey179/vfsstream": "^1.6",
-        "phpunit/phpunit": "^8.1"
+        "phpunit/phpunit": "^9.6"
     },
     "autoload": {
         "psr-4": {

phpunit.xml

@@ -2,29 +2,14 @@
 
 <!-- http://www.phpunit.de/manual/current/en/appendixes.configuration.html -->
 <phpunit
-        backupGlobals="false"
-        backupStaticAttributes="false"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.6/phpunit.xsd"
         bootstrap="tests/bootstrap.php"
-        convertErrorsToExceptions="true"
-        convertNoticesToExceptions="true"
-        convertWarningsToExceptions="true"
-        colors="false"
-        >
+    >
 
     <testsuites>
         <testsuite name="IbexaDesignEngine tests suite">
-            <directory suffix="Test.php">./tests</directory>
+            <directory>./tests</directory>
         </testsuite>
     </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>./</directory>
-            <exclude>
-                <directory>tests/</directory>
-                <directory>vendor/</directory>
-            </exclude>
-        </whitelist>
-    </filter>
-
 </phpunit>

src/bundle/DataCollector/TwigDataCollector.php

@@ -4,6 +4,7 @@
  * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
+
 namespace Ibexa\Bundle\DesignEngine\DataCollector;
 
 use Ibexa\DesignEngine\Templating\TemplatePathRegistryInterface;

src/bundle/DependencyInjection/Compiler/AssetPathResolutionPass.php

@@ -4,6 +4,7 @@
  * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
+
 namespace Ibexa\Bundle\DesignEngine\DependencyInjection\Compiler;
 
 use Ibexa\DesignEngine\Asset\AssetPathProvisionerInterface;

src/bundle/DependencyInjection/Compiler/AssetThemePass.php

@@ -4,6 +4,7 @@
  * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
+
 namespace Ibexa\Bundle\DesignEngine\DependencyInjection\Compiler;
 
 use Ibexa\Contracts\DesignEngine\DesignAwareInterface;

src/bundle/DependencyInjection/Compiler/TwigThemePass.php

@@ -4,6 +4,7 @@
  * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
+
 namespace Ibexa\Bundle\DesignEngine\DependencyInjection\Compiler;
 
 use Ibexa\Bundle\DesignEngine\DataCollector\TwigDataCollector;

src/bundle/DependencyInjection/Configuration.php

@@ -4,6 +4,7 @@
  * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
+
 namespace Ibexa\Bundle\DesignEngine\DependencyInjection;
 
 use Ibexa\Bundle\Core\DependencyInjection\Configuration\SiteAccessAware\Configuration as SiteAccessConfiguration;

src/bundle/DependencyInjection/DesignConfigParser.php

@@ -4,6 +4,7 @@
  * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
+
 namespace Ibexa\Bundle\DesignEngine\DependencyInjection;
 
 use Ibexa\Bundle\Core\DependencyInjection\Configuration\ParserInterface;

src/bundle/DependencyInjection/IbexaDesignEngineExtension.php

@@ -4,6 +4,7 @@
  * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
+
 namespace Ibexa\Bundle\DesignEngine\DependencyInjection;
 
 use Ibexa\Bundle\Core\DependencyInjection\Configuration\SiteAccessAware\ConfigurationProcessor;

src/bundle/IbexaDesignEngineBundle.php

@@ -4,6 +4,7 @@
  * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
+
 namespace Ibexa\Bundle\DesignEngine;
 
 use Ibexa\Bundle\DesignEngine\DependencyInjection\Compiler\AssetPathResolutionPass;

src/contracts/DesignAwareInterface.php

@@ -4,6 +4,7 @@
  * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
+
 namespace Ibexa\Contracts\DesignEngine;
 
 interface DesignAwareInterface

src/lib/Asset/AssetPathProvisionerInterface.php

@@ -4,6 +4,7 @@
  * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
+
 namespace Ibexa\DesignEngine\Asset;
 
 interface AssetPathProvisionerInterface

src/lib/Asset/AssetPathResolver.php

@@ -4,6 +4,7 @@
  * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
+
 namespace Ibexa\DesignEngine\Asset;
 
 use Ibexa\DesignEngine\Exception\InvalidDesignException;

src/lib/Asset/AssetPathResolverInterface.php

@@ -4,6 +4,7 @@
  * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
+
 namespace Ibexa\DesignEngine\Asset;
 
 /**

src/lib/Asset/ProvisionedPathResolver.php

@@ -4,6 +4,7 @@
  * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
+
 namespace Ibexa\DesignEngine\Asset;
 
 use Symfony\Component\Finder\Finder;

src/lib/Asset/ThemePackage.php

@@ -4,6 +4,7 @@
  * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
+
 namespace Ibexa\DesignEngine\Asset;
 
 use Ibexa\Contracts\DesignEngine\DesignAwareInterface;

src/lib/DesignAwareTrait.php

@@ -4,6 +4,7 @@
  * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
+
 namespace Ibexa\DesignEngine;
 
 use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface;

src/lib/Exception/InvalidDesignException.php

@@ -4,6 +4,7 @@
  * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
+
 namespace Ibexa\DesignEngine\Exception;
 
 use InvalidArgumentException;

src/lib/Templating/TemplateNameResolverInterface.php

@@ -4,6 +4,7 @@
  * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
+
 namespace Ibexa\DesignEngine\Templating;
 
 use Ibexa\Contracts\DesignEngine\DesignAwareInterface;

src/lib/Templating/TemplatePathRegistry.php

@@ -4,6 +4,7 @@
  * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
+
 namespace Ibexa\DesignEngine\Templating;
 
 use Serializable;

src/lib/Templating/TemplatePathRegistryInterface.php

@@ -4,6 +4,7 @@
  * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
+
 namespace Ibexa\DesignEngine\Templating;
 
 /**

src/lib/Templating/ThemeTemplateNameResolver.php

@@ -4,6 +4,7 @@
  * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
+
 namespace Ibexa\DesignEngine\Templating;
 
 use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface;

src/lib/Templating/Twig/TwigThemeLoader.php

@@ -4,6 +4,7 @@
  * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
+
 namespace Ibexa\DesignEngine\Templating\Twig;
 
 use Ibexa\DesignEngine\Templating\TemplateNameResolverInterface;

tests/lib/Asset/AssetPathResolverTest.php

@@ -4,6 +4,7 @@
  * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
+
 namespace Ibexa\Tests\DesignEngine\Asset;
 
 use Ibexa\DesignEngine\Asset\AssetPathResolver;
@@ -18,7 +19,7 @@ public function testResolveAssetPathFail()
     {
         $logger = $this->createMock(LoggerInterface::class);
         $logger
-            ->expects($this->once())
+            ->expects(self::once())
             ->method('warning');
 
         $resolver = new AssetPathResolver(['foo' => []], __DIR__, $logger);

tests/lib/Asset/ProvisionedPathResolverTest.php

@@ -4,6 +4,7 @@
  * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
+
 namespace Ibexa\Tests\DesignEngine\Asset;
 
 use Ibexa\DesignEngine\Asset\AssetPathResolver;
@@ -37,7 +38,7 @@ public function testResolvePathNotProvisioned()
         $design = 'foo';
         $expected = 'some/path/images/some_image.jpg';
         $this->innerResolver
-            ->expects($this->once())
+            ->expects(self::once())
             ->method('resolveAssetPath')
             ->with($assetLogicalPath, $design)
             ->willReturn($expected);

tests/lib/Asset/ThemePackageTest.php

@@ -4,6 +4,7 @@
  * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
+
 namespace Ibexa\Tests\DesignEngine\Asset;
 
 use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface;
@@ -45,12 +46,12 @@ public function testGetUrl()
         $currentDesign = 'foo';
 
         $this->assetPathResolver
-            ->expects($this->once())
+            ->expects(self::once())
             ->method('resolveAssetPath')
             ->with($assetPath, $currentDesign)
             ->willReturn($fullAssetPath);
         $this->innerPackage
-            ->expects($this->once())
+            ->expects(self::once())
             ->method('getUrl')
             ->with($fullAssetPath)
             ->willReturn("/$fullAssetPath");
@@ -71,13 +72,13 @@ public function testGetVersion()
         $currentDesign = 'foo';
 
         $this->assetPathResolver
-            ->expects($this->once())
+            ->expects(self::once())
             ->method('resolveAssetPath')
             ->with($assetPath, $currentDesign)
             ->willReturn($fullAssetPath);
         $version = 'v1';
         $this->innerPackage
-            ->expects($this->once())
+            ->expects(self::once())
             ->method('getVersion')
             ->with($fullAssetPath)
             ->willReturn($version);

tests/lib/Templating/TemplatePathRegistryTest.php

@@ -4,6 +4,7 @@
  * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
+
 namespace Ibexa\Tests\DesignEngine\Templating;
 
 use Ibexa\DesignEngine\Templating\TemplatePathRegistry;

tests/lib/Templating/ThemeTemplateNameResolverTest.php

@@ -4,6 +4,7 @@
  * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
+
 namespace Ibexa\Tests\DesignEngine\Templating;
 
 use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface;