Merge branch '1.1'

ezsystems · Jan 4, 2021 · 4168bc5 · 4168bc5
2 parents 99897c4 + 3b6d433
commit 4168bc5
Show file tree

Hide file tree

Showing 160 changed files with 194 additions and 213 deletions.
diff --git a/.php_cs b/.php_cs
@@ -1,30 +1,12 @@
 <?php
 
-return PhpCsFixer\Config::create()
-    ->setRules([
-        '@Symfony' => true,
-        '@Symfony:risky' => true,
-        'concat_space' => ['spacing' => 'one'],
-        'array_syntax' => false,
-        'simplified_null_return' => false,
-        'phpdoc_align' => false,
-        'phpdoc_separation' => false,
-        'phpdoc_to_comment' => false,
-        'cast_spaces' => false,
-        'blank_line_after_opening_tag' => false,
-        'single_blank_line_before_namespace' => false,
-        'phpdoc_annotation_without_dot' => false,
-        'phpdoc_no_alias_tag' => false,
-        'space_after_semicolon' => false,
-        'yoda_style' => false,
-        'no_break_comment' => false,
-    ])
-    ->setRiskyAllowed(true)
+return EzSystems\EzPlatformCodeStyle\PhpCsFixer\EzPlatformInternalConfigFactory::build()
     ->setFinder(
         PhpCsFixer\Finder::create()
-            ->in(__DIR__)
-            ->exclude([
-                'vendor',
+            ->in([
+                __DIR__ . '/src',
+                __DIR__ . '/tests',
             ])
             ->files()->name('*.php')
-    );
+    )
+;
diff --git a/composer.json b/composer.json
@@ -24,7 +24,7 @@
     },
     "require-dev": {
         "phpunit/phpunit": "^8.2",
-        "ezsystems/ezplatform-code-style": "^0.1.0",
+        "ezsystems/ezplatform-code-style": "^0.4",
         "dg/bypass-finals": "^1.1"
     },
     "autoload": {

diff --git a/src/bundle/Command/ExportCommand.php b/src/bundle/Command/ExportCommand.php
@@ -1,19 +1,16 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);
 
 namespace EzSystems\EzRecommendationClientBundle\Command;
 
 use EzSystems\EzRecommendationClient\Factory\ExportParametersFactoryInterface;
-use EzSystems\EzRecommendationClient\Helper\ParamsConverterHelper;
-
 use EzSystems\EzRecommendationClient\Http\HttpEnvironmentInterface;
 use EzSystems\EzRecommendationClient\Service\ExportServiceInterface;
-use EzSystems\EzRecommendationClient\Value\ExportParameters;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;

diff --git a/src/bundle/Command/UserAttributesUpdateCommand.php b/src/bundle/Command/UserAttributesUpdateCommand.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);

diff --git a/src/bundle/Controller/ContentController.php b/src/bundle/Controller/ContentController.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);

diff --git a/src/bundle/Controller/ContentTypeController.php b/src/bundle/Controller/ContentTypeController.php
@@ -1,15 +1,15 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);
 
 namespace EzSystems\EzRecommendationClientBundle\Controller;
 
-use eZ\Publish\API\Repository\Repository;
 use eZ\Publish\API\Repository\LocationService as LocationServiceInterface;
+use eZ\Publish\API\Repository\Repository;
 use eZ\Publish\API\Repository\SearchService as SearchServiceInterface;
 use eZ\Publish\API\Repository\Values\Content\Query;
 use eZ\Publish\API\Repository\Values\Content\Query\Criterion;

diff --git a/src/bundle/Controller/ExportController.php b/src/bundle/Controller/ExportController.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);

diff --git a/src/bundle/Controller/RecommendationController.php b/src/bundle/Controller/RecommendationController.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);

diff --git a/src/bundle/DependencyInjection/Compiler/RestResponsePass.php b/src/bundle/DependencyInjection/Compiler/RestResponsePass.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);

diff --git a/src/bundle/DependencyInjection/Configuration.php b/src/bundle/DependencyInjection/Configuration.php
@@ -1,6 +1,7 @@
 <?php
+
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);

diff --git a/src/bundle/DependencyInjection/ConfigurationMapper.php b/src/bundle/DependencyInjection/ConfigurationMapper.php
@@ -1,6 +1,7 @@
 <?php
+
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);
@@ -10,7 +11,6 @@
 use eZ\Bundle\EzPublishCoreBundle\DependencyInjection\Configuration\SiteAccessAware\ContextualizerInterface;
 use eZ\Bundle\EzPublishCoreBundle\DependencyInjection\Configuration\SiteAccessAware\HookableConfigurationMapperInterface;
 use EzSystems\EzRecommendationClient\Value\Parameters;
-use Symfony\Component\DependencyInjection\ContainerInterface;
 
 class ConfigurationMapper implements HookableConfigurationMapperInterface
 {

diff --git a/src/bundle/DependencyInjection/EzRecommendationClientExtension.php b/src/bundle/DependencyInjection/EzRecommendationClientExtension.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);

diff --git a/src/bundle/EzRecommendationClientBundle.php b/src/bundle/EzRecommendationClientBundle.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);

diff --git a/src/bundle/ParamConverter/ExportRequestParamConverter.php b/src/bundle/ParamConverter/ExportRequestParamConverter.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);

diff --git a/src/bundle/ParamConverter/ListParamConverter.php b/src/bundle/ParamConverter/ListParamConverter.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);

diff --git a/src/bundle/Serializer/Normalizer/AttributeNormalizer.php b/src/bundle/Serializer/Normalizer/AttributeNormalizer.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);

diff --git a/src/bundle/Serializer/Normalizer/UserCollectionNormalizer.php b/src/bundle/Serializer/Normalizer/UserCollectionNormalizer.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);
@@ -53,7 +53,7 @@ private function getNormalizedUsers(UserCollection $object): array
         $users = $this->owningNormalizer->normalize($object->getUsers());
 
         $normalizedUsers = [];
-        $normalizedUsers[self::ATTR_NAME] = array_map(function ($item) {
+        $normalizedUsers[self::ATTR_NAME] = array_map(static function ($item) {
             return $item[self::ATTR_NAME];
         }, $users);
 

diff --git a/src/bundle/Serializer/Normalizer/UserNormalizer.php b/src/bundle/Serializer/Normalizer/UserNormalizer.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);
@@ -61,7 +61,7 @@ private function getNormalizedAttributes(array $attributes): array
         $attributes = $this->owningNormalizer->normalize($attributes);
 
         $normalizedAttributes = [];
-        $normalizedAttributes['attribute'] = array_map(function ($item) {
+        $normalizedAttributes['attribute'] = array_map(static function ($item) {
             return $item['attribute'];
         }, $attributes);
 

diff --git a/src/bundle/Templating/Twig/Functions/AbstractFunction.php b/src/bundle/Templating/Twig/Functions/AbstractFunction.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);

diff --git a/src/bundle/Templating/Twig/Functions/Recommendation.php b/src/bundle/Templating/Twig/Functions/Recommendation.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);

diff --git a/src/bundle/Templating/Twig/Functions/UserTracking.php b/src/bundle/Templating/Twig/Functions/UserTracking.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);

diff --git a/src/bundle/Templating/Twig/RecommendationExtension.php b/src/bundle/Templating/Twig/RecommendationExtension.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);

diff --git a/src/lib/API/AbstractAPI.php b/src/lib/API/AbstractAPI.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);

diff --git a/src/lib/API/AllowedAPI.php b/src/lib/API/AllowedAPI.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);

diff --git a/src/lib/API/EventTracking.php b/src/lib/API/EventTracking.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);

diff --git a/src/lib/API/Notifier.php b/src/lib/API/Notifier.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);

diff --git a/src/lib/API/Recommendation.php b/src/lib/API/Recommendation.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);

diff --git a/src/lib/API/User.php b/src/lib/API/User.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);

diff --git a/src/lib/Authentication/AuthenticatorInterface.php b/src/lib/Authentication/AuthenticatorInterface.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);

diff --git a/src/lib/Authentication/ExportAuthenticator.php b/src/lib/Authentication/ExportAuthenticator.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);

diff --git a/src/lib/Authentication/FileAuthenticatorInterface.php b/src/lib/Authentication/FileAuthenticatorInterface.php
@@ -1,6 +1,7 @@
 <?php
+
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);

diff --git a/src/lib/Client/EzRecommendationClient.php b/src/lib/Client/EzRecommendationClient.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);
@@ -15,15 +15,13 @@
 use EzSystems\EzRecommendationClient\Exception\CredentialsNotFoundException;
 use EzSystems\EzRecommendationClient\Factory\EzRecommendationClientAPIFactory;
 use GuzzleHttp\ClientInterface;
-use GuzzleHttp\Exception\GuzzleException;
 use GuzzleHttp\Exception\BadResponseException as GuzzleBadResponseException;
 use GuzzleHttp\HandlerStack;
 use GuzzleHttp\Middleware;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\UriInterface;
 use Psr\Log\LoggerInterface;
-use function GuzzleHttp\Psr7\str;
 
 final class EzRecommendationClient implements EzRecommendationClientInterface
 {
@@ -233,7 +231,7 @@ private function getRequestLogMessage(array $transaction): string
             $method = 'Method: ' . $transaction['request']->getMethod();
             $requestHeaders = $this->getHeadersAsString($transaction['request']->getheaders());
 
-            $message .= 'RequestUri: ' . $requestUri . self::MESSAGE_SEPARATOR . $method . self::MESSAGE_SEPARATOR . '?'. $requestHeaders;
+            $message .= 'RequestUri: ' . $requestUri . self::MESSAGE_SEPARATOR . $method . self::MESSAGE_SEPARATOR . '?' . $requestHeaders;
         }
 
         if (isset($transaction['response']) && $transaction['response'] instanceof ResponseInterface) {

diff --git a/src/lib/Client/EzRecommendationClientInterface.php b/src/lib/Client/EzRecommendationClientInterface.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);