minor #709 Improved code thanks to PhpStorm and Php Inspections (javi…

…ereguiluz) This PR was squashed before being merged into the master branch (closes #709). Discussion ---------- Improved code thanks to PhpStorm and Php Inspections Commits ------- 061b405 Improved code thanks to PhpStorm and Php Inspections
symfony · Nov 28, 2017 · 341cea2 · 341cea2
2 parents 68b0653 + 061b405
commit 341cea2
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 23 deletions.
diff --git a/src/Command/AddUserCommand.php b/src/Command/AddUserCommand.php
@@ -199,7 +199,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         $event = $stopwatch->stop('add-user-command');
         if ($output->isVerbose()) {
-            $this->io->comment(sprintf('New user database id: %d / Elapsed time: %.2f ms / Consumed memory: %.2f MB', $user->getId(), $event->getDuration(), $event->getMemory() / pow(1024, 2)));
+            $this->io->comment(sprintf('New user database id: %d / Elapsed time: %.2f ms / Consumed memory: %.2f MB', $user->getId(), $event->getDuration(), $event->getMemory() / (1024 ** 2)));
         }
     }
 

diff --git a/src/DataFixtures/FixturesTrait.php b/src/DataFixtures/FixturesTrait.php
@@ -123,7 +123,7 @@ private function getRandomPostSummary(int $maxLength = 255): string
     {
         $phrases = $this->getPhrases();
 
-        $numPhrases = mt_rand(6, 12);
+        $numPhrases = random_int(6, 12);
         shuffle($phrases);
         $phrases = array_slice($phrases, 0, $numPhrases - 1);
 
@@ -138,7 +138,7 @@ private function getRandomCommentContent(): string
     {
         $phrases = $this->getPhrases();
 
-        $numPhrases = mt_rand(2, 15);
+        $numPhrases = random_int(2, 15);
         shuffle($phrases);
 
         return implode(' ', array_slice($phrases, 0, $numPhrases - 1));

diff --git a/src/DataFixtures/ORM/PostFixtures.php b/src/DataFixtures/ORM/PostFixtures.php
@@ -57,7 +57,7 @@ public function load(ObjectManager $manager): void
             $post->setAuthor(0 === $i ? $this->getReference('jane-admin') : $this->getRandomUser());
 
             // for aesthetic reasons, the first blog post always has 2 tags
-            foreach ($this->getRandomTags($i > 0 ? mt_rand(0, 3) : 2) as $tag) {
+            foreach ($this->getRandomTags($i > 0 ? random_int(0, 3) : 2) as $tag) {
                 $post->addTag($tag);
             }
 

diff --git a/src/Entity/User.php b/src/Entity/User.php
@@ -168,26 +168,16 @@ public function eraseCredentials(): void
      */
     public function serialize(): string
     {
-        return serialize([
-            $this->id,
-            $this->username,
-            $this->password,
-            // see section on salt below
-            // $this->salt,
-        ]);
+        // add $this->salt too if you don't use Bcrypt or Argon2i
+        return serialize([$this->id, $this->username, $this->password]);
     }
 
     /**
      * {@inheritdoc}
      */
     public function unserialize($serialized): void
     {
-        list(
-            $this->id,
-            $this->username,
-            $this->password,
-            // see section on salt below
-            // $this->salt
-        ) = unserialize($serialized);
+        // add $this->salt too if you don't use Bcrypt or Argon2i
+        [$this->id, $this->username, $this->password] = unserialize($serialized, ['allowed_classes' => false]);
     }
 }
diff --git a/src/EventSubscriber/RedirectToPreferredLocaleSubscriber.php b/src/EventSubscriber/RedirectToPreferredLocaleSubscriber.php
@@ -28,8 +28,8 @@
 class RedirectToPreferredLocaleSubscriber implements EventSubscriberInterface
 {
     private $urlGenerator;
-    private $locales = [];
-    private $defaultLocale = '';
+    private $locales;
+    private $defaultLocale;
 
     public function __construct(UrlGeneratorInterface $urlGenerator, string $locales, string $defaultLocale = null)
     {

diff --git a/src/Form/Type/DateTimePickerType.php b/src/Form/Type/DateTimePickerType.php
@@ -41,7 +41,7 @@ public function __construct(MomentFormatConverter $converter)
     public function buildView(FormView $view, FormInterface $form, array $options)
     {
         $view->vars['attr']['data-date-format'] = $this->formatConverter->convert($options['format']);
-        $view->vars['attr']['data-date-locale'] = mb_strtolower(strtr(\Locale::getDefault(), '_', '-'));
+        $view->vars['attr']['data-date-locale'] = mb_strtolower(str_replace('_', '-', \Locale::getDefault()));
     }
 
     /**

diff --git a/tests/Form/DataTransformer/TagArrayToStringTransformerTest.php b/tests/Form/DataTransformer/TagArrayToStringTransformerTest.php
@@ -106,7 +106,7 @@ public function testTransform()
      *
      * @return TagArrayToStringTransformer
      */
-    private function getMockedTransformer($findByReturnValues = [])
+    private function getMockedTransformer(array $findByReturnValues = []): TagArrayToStringTransformer
     {
         $tagRepository = $this->getMockBuilder(EntityRepository::class)
             ->disableOriginalConstructor()
@@ -133,7 +133,7 @@ private function getMockedTransformer($findByReturnValues = [])
      *
      * @return Tag
      */
-    private function createTag($name)
+    private function createTag($name): Tag
     {
         $tag = new Tag();
         $tag->setName($name);