...

Pushword · Nov 9, 2021 · da00c85 · da00c85
1 parent 1877835
commit da00c85
Show file tree

Hide file tree

Showing 11 changed files with 36 additions and 37 deletions.
diff --git a/packages/admin-block-editor/src/Block/DefaultBlock.php b/packages/admin-block-editor/src/Block/DefaultBlock.php
@@ -25,7 +25,7 @@ class DefaultBlock extends AbstractBlock
 
     public function __construct(string $name)
     {
-        if (! \in_array($name, self::AVAILABLE_BLOCKS)) {
+        if (! \in_array($name, self::AVAILABLE_BLOCKS, true)) {
             throw new Exception('Not a default block `'.$name.'`');
         }
 

diff --git a/packages/admin/src/FormField/MediaPreviewField.php b/packages/admin/src/FormField/MediaPreviewField.php
@@ -35,14 +35,14 @@ private function issetRelatedPages(): bool
     {
         $relatedPages = $this->getRelatedPages();
 
-        if (! empty($relatedPages['content']) || $relatedPages['mainImage']->count() > 0) {
+        if ([] !== $relatedPages['content'] || $relatedPages['mainImage']->count() > 0) {
             return true;
         } else {
             return false;
         }
     }
 
-    private function getRelatedPages(): ?array
+    private function getRelatedPages(): array
     {
         if (null !== $this->relatedPages) {
             return $this->relatedPages;

diff --git a/packages/admin/src/FormField/PageSlugField.php b/packages/admin/src/FormField/PageSlugField.php
@@ -10,7 +10,7 @@ class PageSlugField extends AbstractField
 {
     protected function getSlugHelp()
     {
-        if (! $this->admin->hasSubject() || ! $this->admin->getSubject()->getSlug()) {
+        if ('' === $this->admin->getSubject()->getSlug()) {
             return 'admin.page.slug.help';
         }
 

diff --git a/packages/admin/src/PageAdmin.php b/packages/admin/src/PageAdmin.php
@@ -65,7 +65,7 @@ protected function configureFormFields(FormMapper $form): void
         $form->end();
 
         foreach ($fields[1] as $k => $block) {
-            if (! ($this->getSubject() && $this->getSubject()->getSlug()) && 'admin.page.revisions' == $k) {
+            if (null === $this->getSubject()->getId() && 'admin.page.revisions' == $k) {
                 continue;
             }
 
@@ -82,7 +82,7 @@ protected function configureFormFields(FormMapper $form): void
 
     protected function alterNewInstance(object $object): void
     {
-        if (! $object instanceof PageInterface) {
+        if (false === $object instanceof PageInterface) {
             return;
         }
 

diff --git a/packages/admin/src/PageCRUDController.php b/packages/admin/src/PageCRUDController.php
@@ -19,7 +19,7 @@ public function loadContainer(ContainerInterface $container): void
     {
         $this->container = $container;
 
-        if (! $this->container->has('parameter_bag')) {
+        if (false === $this->container->has('parameter_bag')) {
             throw new Exception('patch no longer worked');
         }
     }

diff --git a/packages/conversation/src/Form/FormTrait.php b/packages/conversation/src/Form/FormTrait.php
@@ -229,7 +229,7 @@ protected function showSuccess(): string
     protected function getNextStepFunctionName()
     {
         $getFormMethod = 'getStep'.self::$step[$this->getNextStep()];
-        if (! method_exists($this, $getFormMethod)) {
+        if (false === method_exists($this, $getFormMethod)) {
             return false;
         }
 

diff --git a/packages/conversation/src/Form/MessageForm.php b/packages/conversation/src/Form/MessageForm.php
@@ -38,7 +38,7 @@ protected function getUser()
             return null;
         }
 
-        if (! \is_object($user = $token->getUser())) {
+        if (false === \is_object($user = $token->getUser())) {
             // e.g. anonymous authentication
             return null;
         }

diff --git a/packages/core/src/Component/App/AppPool.php b/packages/core/src/Component/App/AppPool.php
@@ -56,7 +56,7 @@ public function switchCurrentApp($host): self
 
     public function get(?string $host = ''): AppConfig
     {
-        $host = ! $host ? $this->currentApp : $host;
+        $host = \in_array($host, [null, ''], true) ? $this->currentApp : $host;
         if (isset($this->apps[$host])) {
             return $this->apps[$host];
         }
@@ -133,7 +133,7 @@ public function sameHost($host): bool
 
     public function getApp(string $host = ''): AppConfig
     {
-        if (! $host) {
+        if ('' === $host) {
             $host = $this->currentApp;
         }
 

diff --git a/packages/core/src/Component/EntityFilter/ManagerPool.php b/packages/core/src/Component/EntityFilter/ManagerPool.php
@@ -34,7 +34,7 @@ public function getProperty(object $entity, string $property = '')
     {
         $manager = $this->getManager($entity);
 
-        if (! $property) {
+        if ('' === $property) {
             return $manager;
         }
 

diff --git a/packages/skeleton/var/app.db b/packages/skeleton/var/app.db
diff --git a/rector.php b/rector.php
@@ -26,35 +26,34 @@ function ($path) { return __DIR__.'/'.$path; },
 
     $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersion::PHP_74);
 
-    /**/
-    $containerConfigurator->import(SetList::DEAD_CODE);
+    //$containerConfigurator->import(SetList::DEAD_CODE);
+
 
-    /**
     $containerConfigurator->import(SetList::TYPE_DECLARATION);
 
     $services = $containerConfigurator->services();
 
-    $services->set(BooleanInBooleanNotRuleFixerRector::class)
-        ->call('configure', [[
-            BooleanInBooleanNotRuleFixerRector::TREAT_AS_NON_EMPTY => true,
-        ]]);
-    $services->set(BooleanInIfConditionRuleFixerRector::class)
-        ->call('configure', [[
-            BooleanInIfConditionRuleFixerRector::TREAT_AS_NON_EMPTY => false,
-        ]]);
-    $services->set(BooleanInTernaryOperatorRuleFixerRector::class)
-        ->call('configure', [[
-            BooleanInTernaryOperatorRuleFixerRector::TREAT_AS_NON_EMPTY => false,
-        ]]);
-    $services->set(DisallowedEmptyRuleFixerRector::class)
-        ->call('configure', [[
-            DisallowedEmptyRuleFixerRector::TREAT_AS_NON_EMPTY => false,
-        ]]);
-    $services->set(DisallowedShortTernaryRuleFixerRector::class)
-        ->call('configure', [[
-            DisallowedShortTernaryRuleFixerRector::TREAT_AS_NON_EMPTY => false,
-        ]]);
-
-    /**/
+    // $services->set(BooleanInBooleanNotRuleFixerRector::class)
+    //     ->call('configure', [[
+    //         BooleanInBooleanNotRuleFixerRector::TREAT_AS_NON_EMPTY => true,
+    //     ]]); // ...
+
+    // $services->set(BooleanInIfConditionRuleFixerRector::class)
+    //     ->call('configure', [[
+    //         BooleanInIfConditionRuleFixerRector::TREAT_AS_NON_EMPTY => false,
+    //     ]]);
+    // $services->set(BooleanInTernaryOperatorRuleFixerRector::class)
+    //     ->call('configure', [[
+    //         BooleanInTernaryOperatorRuleFixerRector::TREAT_AS_NON_EMPTY => false,
+    //     ]]);
+    // $services->set(DisallowedEmptyRuleFixerRector::class)
+    //     ->call('configure', [[
+    //         DisallowedEmptyRuleFixerRector::TREAT_AS_NON_EMPTY => false,
+    //     ]]);
+    // $services->set(DisallowedShortTernaryRuleFixerRector::class)
+    //     ->call('configure', [[
+    //         DisallowedShortTernaryRuleFixerRector::TREAT_AS_NON_EMPTY => false,
+    //     ]]);
+
 
 };