Merge branch 'master' of github.com:symfony/demo

Author: VolCh

.travis.yml

@@ -14,9 +14,13 @@ matrix:
   fast_finish: true
   include:
     - php: 7.1
+    - php: 7.2
+    - php: nightly
+  allow_failures:
+    - php: nightly
 
 before_install:
-  - phpenv config-rm xdebug.ini
+  - '[[ "$TRAVIS_PHP_VERSION" == "nightly" ]] || phpenv config-rm xdebug.ini'
   - composer self-update
 
 install:
@@ -26,7 +30,7 @@ install:
 script:
   - ./vendor/bin/simple-phpunit
   # this checks that the source code follows the Symfony Code Syntax rules
-  - ./vendor/bin/php-cs-fixer fix --diff --dry-run -v
+  - '[[ "$TRAVIS_PHP_VERSION" == "nightly" ]] || ./vendor/bin/php-cs-fixer fix --diff --dry-run -v'
   # this checks that the YAML config files contain no syntax errors
   - ./bin/console lint:yaml config
   # this checks that the Twig template files contain no syntax errors

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)));
         }
     }
 

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));

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);
             }
 

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]);
     }
 }

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)
     {

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()));
     }
 
     /**

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);

tests/Utils/ValidatorTest.php

@@ -34,13 +34,15 @@ public function testValidateUsername()
 
     public function testValidateUsernameEmpty()
     {
-        $this->setExpectedException('Exception', 'The username can not be empty.');
+        $this->expectException('Exception');
+        $this->expectExceptionMessage('The username can not be empty.');
         $this->object->validateUsername(null);
     }
 
     public function testValidateUsernameInvalid()
     {
-        $this->setExpectedException('Exception', 'The username must contain only lowercase latin characters and underscores.');
+        $this->expectException('Exception');
+        $this->expectExceptionMessage('The username must contain only lowercase latin characters and underscores.');
         $this->object->validateUsername('INVALID');
     }
 
@@ -53,13 +55,15 @@ public function testValidatePassword()
 
     public function testValidatePasswordEmpty()
     {
-        $this->setExpectedException('Exception', 'The password can not be empty.');
+        $this->expectException('Exception');
+        $this->expectExceptionMessage('The password can not be empty.');
         $this->object->validatePassword(null);
     }
 
     public function testValidatePasswordInvalid()
     {
-        $this->setExpectedException('Exception', 'The password must be at least 6 characters long.');
+        $this->expectException('Exception');
+        $this->expectExceptionMessage('The password must be at least 6 characters long.');
         $this->object->validatePassword('12345');
     }
 
@@ -72,13 +76,15 @@ public function testValidateEmail()
 
     public function testValidateEmailEmpty()
     {
-        $this->setExpectedException('Exception', 'The email can not be empty.');
+        $this->expectException('Exception');
+        $this->expectExceptionMessage('The email can not be empty.');
         $this->object->validateEmail(null);
     }
 
     public function testValidateEmailInvalid()
     {
-        $this->setExpectedException('Exception', 'The email should look like a real email.');
+        $this->expectException('Exception');
+        $this->expectExceptionMessage('The email should look like a real email.');
         $this->object->validateEmail('invalid');
     }
 
@@ -91,7 +97,8 @@ public function testValidateFullName()
 
     public function testValidateEmailFullName()
     {
-        $this->setExpectedException('Exception', 'The full name can not be empty.');
+        $this->expectException('Exception');
+        $this->expectExceptionMessage('The full name can not be empty.');
         $this->object->validateFullName(null);
     }
 }