...

Pushword · Oct 14, 2022 · 542543b · 542543b
1 parent f4a490c
commit 542543b
Show file tree

Hide file tree

Showing 56 changed files with 62 additions and 37 deletions.
diff --git a/composer.json b/composer.json
@@ -25,7 +25,7 @@
         "doctrine/orm": "^2.8.1",
         "fortawesome/font-awesome": "^6.1",
         "intervention/image": "^2.5",
-        "michelf/php-markdown": "^1.9",
+        "michelf/php-markdown": "^2",
         "miljar/php-exif": "^0.6.5",
         "nette/utils": "^3.2",
         "pagerfanta/twig": "^3.0",
@@ -76,7 +76,7 @@
         "phpstan/phpstan-symfony": "^1.0",
         "phpunit/phpunit": "^9.5",
         "psalm/plugin-symfony": "^3.1",
-        "rector/rector": "^0.13",
+        "rector/rector": "^0.14",
         "squizlabs/php_codesniffer": "^3.5",
         "symfony/dotenv": "^5.4 || ^6.0",
         "symfony/maker-bundle": "^1.35",

diff --git a/docs/architecture.html b/docs/architecture.html
diff --git a/docs/command.html b/docs/command.html
diff --git a/docs/component/entity-filter.html b/docs/component/entity-filter.html
diff --git a/docs/configuration.html b/docs/configuration.html
diff --git a/docs/contribute.html b/docs/contribute.html
diff --git a/docs/create-extension.html b/docs/create-extension.html
diff --git a/docs/editor.html b/docs/editor.html
diff --git a/docs/extension.html b/docs/extension.html
diff --git a/docs/extension/admin-block-editor.html b/docs/extension/admin-block-editor.html
diff --git a/docs/extension/admin.html b/docs/extension/admin.html
diff --git a/docs/extension/advanced-main-image.html b/docs/extension/advanced-main-image.html
diff --git a/docs/extension/conversation.html b/docs/extension/conversation.html
diff --git a/docs/extension/facebook.html b/docs/extension/facebook.html
diff --git a/docs/extension/flat.html b/docs/extension/flat.html
diff --git a/docs/extension/page-scanner.html b/docs/extension/page-scanner.html
diff --git a/docs/extension/page-update-notifier.html b/docs/extension/page-update-notifier.html
diff --git a/docs/extension/static-generator.html b/docs/extension/static-generator.html
diff --git a/docs/extension/svg.html b/docs/extension/svg.html
diff --git a/docs/extension/template-editor.html b/docs/extension/template-editor.html
diff --git a/docs/extension/version.html b/docs/extension/version.html
diff --git a/docs/extensions.html b/docs/extensions.html
diff --git a/docs/index.html b/docs/index.html
diff --git a/docs/installation.html b/docs/installation.html
diff --git a/docs/license.html b/docs/license.html
diff --git a/docs/manage-assets.html b/docs/manage-assets.html
diff --git a/docs/override-theme.html b/docs/override-theme.html
diff --git a/docs/roadmap.html b/docs/roadmap.html
diff --git a/docs/search.json b/docs/search.json
diff --git a/docs/themes.html b/docs/themes.html
diff --git a/docs/upgrade.html b/docs/upgrade.html
diff --git a/packages/admin/src/AdminInterface.php b/packages/admin/src/AdminInterface.php
@@ -14,6 +14,7 @@
 
 /**
  * @template T of object
+ *
  * @extends AdminAdminInterface<T>
  */
 interface AdminInterface extends AdminAdminInterface

diff --git a/packages/admin/src/FormField/CreatedAtField.php b/packages/admin/src/FormField/CreatedAtField.php
@@ -8,6 +8,7 @@
 
 /**
  * @template T of object
+ *
  * @extends AbstractField<T>
  */
 class CreatedAtField extends AbstractField

diff --git a/packages/admin/src/FormField/CustomPropertiesField.php b/packages/admin/src/FormField/CustomPropertiesField.php
@@ -7,6 +7,7 @@
 
 /**
  * @template T of object
+ *
  * @extends AbstractField<T>
  */
 class CustomPropertiesField extends AbstractField

diff --git a/packages/admin/src/FormField/PriorityField.php b/packages/admin/src/FormField/PriorityField.php
@@ -7,6 +7,7 @@
 
 /**
  * @template T of object
+ *
  * @extends AbstractField<T>
  */
 class PriorityField extends AbstractField

diff --git a/packages/admin/src/PageAdmin.php b/packages/admin/src/PageAdmin.php
@@ -180,6 +180,7 @@ protected function configureListFields(ListMapper $list): void
 
     /**
      * @param PageInterface $object
+     *
      * @psalm-suppress MoreSpecificImplementedParamType
      */
     public function getObjectMetadata(object $object): Metadata

diff --git a/packages/admin/src/config/services.yaml b/packages/admin/src/config/services.yaml
@@ -55,7 +55,7 @@ services:
       - [setPageClass, ["%pw.entity_page%"]]
       - [setMediaClass, ["%pw.entity_media%"]]
     tags:
-      - { name: sonata.admin, manager_type: orm, label: admin.label.media }
+      - { name: sonata.admin, manager_type: orm, label: admin.label.media, persist_filters: true }
 
   Pushword\Admin\UserAdminInterface:
     alias: pushword.admin.user

diff --git a/packages/conversation/src/Controller/ConversationFormController.php b/packages/conversation/src/Controller/ConversationFormController.php
@@ -112,7 +112,7 @@ private function initResponse(Request $request): Response
         $response = new Response();
 
         if (! \in_array($request->headers->get('origin'), $this->getPossibleOrigins($request), true)) {
-            throw new ErrorException('origin sent is not authorized'.' ('.$request->headers->get('origin').') '.\Safe\json_encode($this->getPossibleOrigins($request)).'.');
+            throw new ErrorException('origin sent is not authorized ('.$request->headers->get('origin').') '.\Safe\json_encode($this->getPossibleOrigins($request)).'.');
         }
 
         $response->headers->set('Access-Control-Allow-Credentials', 'true');

diff --git a/packages/core/composer.json b/packages/core/composer.json
@@ -16,7 +16,7 @@
         "doctrine/doctrine-migrations-bundle": "^3.0",
         "doctrine/orm": "^2.8.1",
         "intervention/image": "^2.5",
-        "michelf/php-markdown": "^1.9",
+        "michelf/php-markdown": "^2",
         "pagerfanta/twig": "^3.0",
         "piedweb/render-html-attributes": "^2.0.1",
         "piedweb/url-harvester": "^0.0.31",

diff --git a/packages/core/src/Component/EntityFilter/ManagerPool.php b/packages/core/src/Component/EntityFilter/ManagerPool.php
@@ -10,6 +10,7 @@
 
 /**
  * @template T of object
+ *
  * @implements ManagerPoolInterface<T>
  */
 final class ManagerPool implements ManagerPoolInterface
@@ -28,6 +29,7 @@ final class ManagerPool implements ManagerPoolInterface
 
     /**
      * @return Manager<T>
+     *
      * @psalm-suppress InvalidArgument
      */
     public function getManager(IdInterface $id): Manager

diff --git a/packages/core/src/Controller/PageController.php b/packages/core/src/Controller/PageController.php
@@ -202,6 +202,7 @@ public function setApp(PageInterface|string $host): void
     /**
      * @psalm-suppress NullableReturnStatement
      * @psalm-suppress InvalidNullableReturnType
+     *
      * @noRector
      */
     private function getPageElse404(Request $request, ?string &$slug, string $host, bool $extractPager = false): PageInterface

diff --git a/packages/core/src/DependencyInjection/PushwordConfigFactory.php b/packages/core/src/DependencyInjection/PushwordConfigFactory.php
@@ -169,6 +169,7 @@ private function loadToParameters(array $config, string $prefix = ''): void
 
     /**
      * @param array<mixed>|bool|string|int|float|null $value The parameter value
+     *
      * @noRector
      */
     private function setParameter(string $key, $value): void

diff --git a/packages/core/src/Entity/SharedTrait/TimestampableTrait.php b/packages/core/src/Entity/SharedTrait/TimestampableTrait.php
@@ -10,12 +10,14 @@ trait TimestampableTrait
 {
     /**
      * @ORM\Column(type="datetime")
+     *
      * @noRector
      */
     protected ?DateTimeInterface $createdAt = null; // @phpstan-ignore-line
 
     /**
      * @ORM\Column(type="datetime")
+     *
      * @noRector
      */
     protected ?DateTimeInterface $updatedAt = null; // @phpstan-ignore-line

diff --git a/packages/core/src/Entity/UserTrait.php b/packages/core/src/Entity/UserTrait.php
@@ -47,6 +47,7 @@ trait UserTrait
 
     /**
      * @var string The hashed password
+     *
      * @ORM\Column(type="string", nullable=true)
      */
     private ?string $password = null;

diff --git a/packages/core/src/Repository/MediaRepository.php b/packages/core/src/Repository/MediaRepository.php
@@ -10,6 +10,7 @@
 
 /**
  * @extends ServiceEntityRepository<MediaInterface>
+ *
  * @implements Selectable<int, MediaInterface>
  * @implements ObjectRepository<MediaInterface>
  */

diff --git a/packages/core/src/Repository/PageRepository.php b/packages/core/src/Repository/PageRepository.php
@@ -262,7 +262,7 @@ private function simpleAndWhere(QueryBuilder $queryBuilder, array $w): QueryBuil
         return $queryBuilder->andWhere(
             ($w['key_prefix'] ?? $w[4] ?? 'p.').($w['key'] ?? $w[0])
                         .' '.($w['operator'] ?? $w[1])
-                        .(($w['operator'] ?? $w[1]) === 'IN' ? '('.' :m'.$k.')' : ' :m'.$k)
+                        .(($w['operator'] ?? $w[1]) === 'IN' ? '( :m'.$k.')' : ' :m'.$k)
         )->setParameter('m'.$k, $w['value'] ?? $w[2]);
     }
 

diff --git a/packages/core/src/Repository/Repository.php b/packages/core/src/Repository/Repository.php
@@ -11,7 +11,9 @@ class Repository
 {
     /**
      * @param class-string<PageInterface> $pageEntity
+     *
      * @template T as PageInterface
+     *
      * @psalm-suppress InvalidReturnStatement
      * @psalm-suppress InvalidReturnType
      */
@@ -22,6 +24,7 @@ public static function getPageRepository(EntityManagerInterface|ManagerRegistry
 
     /**
      * @param class-string<MediaInterface> $mediaEntity
+     *
      * @psalm-suppress InvalidReturnStatement
      * @psalm-suppress InvalidReturnType
      */

diff --git a/packages/core/src/Repository/UserRepository.php b/packages/core/src/Repository/UserRepository.php
@@ -9,6 +9,7 @@
 
 /**
  * @extends ServiceEntityRepository<UserInterface>
+ *
  * @implements ObjectRepository<UserInterface>
  * @implements Selectable<int, UserInterface>
  */

diff --git a/packages/core/src/Service/ImageManager.php b/packages/core/src/Service/ImageManager.php
@@ -92,6 +92,7 @@ public function generateFilteredCache(MediaInterface|string $media, array|string
 
         /**
          * @psalm-suppress RedundantCondition
+         *
          * @psam-suppress TypeDoesNotContainNull
          */
         $quality = (int) (! isset($filters[$filterName]['quality']) ? 90 : $filters[$filterName]['quality']); // @phpstan-ignore-line

diff --git a/packages/flat/src/FlatFileImporter.php b/packages/flat/src/FlatFileImporter.php
@@ -84,6 +84,7 @@ private function importFile(string $filePath, string $type): void
 
     /**
      * @return AbstractImporter<T>
+     *
      * @psalm-suppress InvalidReturnStatement
      * @psalm-suppress InvalidReturnType
      */

diff --git a/packages/page-scanner/src/Scanner/PageScannerService.php b/packages/page-scanner/src/Scanner/PageScannerService.php
@@ -47,6 +47,7 @@ private function resetErrors(): void
 
     /**
      * @return mixed[]|true
+     *
      * @noRector
      */
     public function scan(PageInterface $page)

diff --git a/packages/skeleton/var/app.db b/packages/skeleton/var/app.db
diff --git a/packages/static-generator/src/StaticAppGenerator.php b/packages/static-generator/src/StaticAppGenerator.php
@@ -57,6 +57,7 @@ public function generatePage(string $host, string $page): void
     /**
      * @throws \RuntimeException
      * @throws \LogicException
+     *
      * @psalm-suppress  UndefinedPropertyAssignment
      */
     private function generateHost(string $host): void

diff --git a/packages/version/src/VersionController.php b/packages/version/src/VersionController.php
@@ -46,6 +46,7 @@ public function setTranslator(TranslatorInterface $translator): void
 
     /**
      * @required
+     *
      * @psalm-suppress PossiblyInvalidArgument
      * @psalm-suppress InvalidPropertyAssignmentValue
      */

diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -1,6 +1,7 @@
 parameters:
     level: max
     paths:
+        - rector.php
         - packages/core/src
         - packages/conversation/src
         - packages/admin/src

diff --git a/rector.php b/rector.php
@@ -60,13 +60,15 @@
 
     $rectorConfig->paths(array_map(
             function ($path) { return __DIR__.'/'.$path; },
-            array_values(json_decode(file_get_contents('composer.json'), true)['autoload']['psr-4'])
+            array_values(\Safe\json_decode(\Safe\file_get_contents('composer.json'), true)['autoload']['psr-4']) // @phpstan-ignore-line
         ));
 
     //$parameters->rule(Option::PHP_VERSION_FEATURES, PhpVersion::PHP_80);
     //$containerConfigurator->import(SetList::PHP_80);
     $rectorConfig->sets([
         LevelSetList::UP_TO_PHP_80,
+        DoctrineSetList::ANNOTATIONS_TO_ATTRIBUTES,
+        SymfonySetList::ANNOTATIONS_TO_ATTRIBUTES,
         // SetList::CODE_QUALITY,
         // SetList::DEAD_CODE,
         // SetList::CODING_STYLE,