Merge remote-tracking branch 'upstream/master' into feature/custom-namespaces

Author: natepage

.gitignore

@@ -3,3 +3,4 @@
 /vendor/
 /tests/tmp/*
 /.php_cs.cache
+/.phpunit.result.cache

.php_cs.dist

@@ -19,6 +19,7 @@ return PhpCsFixer\Config::create()
     ->setRules(array(
         '@Symfony' => true,
         '@Symfony:risky' => true,
+        '@PHPUnit75Migration:risky' => true,
         'array_syntax' => ['syntax' => 'short'],
         'protected_to_private' => false,
         'semicolon_after_instruction' => false,

.travis.yml

@@ -1,34 +1,39 @@
 language: php
-
-dist: trusty
 sudo: false
-
-git:
-    depth: 1
-
-php:
-  - 7.0
-  - 7.1
-  - 7.2
-  - 7.3
-
 cache:
     directories:
         - $HOME/.composer/cache/files
-        - .phpunit
-        - vendor
+        - $HOME/symfony-bridge/.phpunit
+
+services:
+    - mysql
 
 env:
     global:
-        - SYMFONY_PHPUNIT_DIR=.phpunit
+        - PHPUNIT_FLAGS="-v"
+        - SYMFONY_PHPUNIT_DIR="$HOME/symfony-bridge/.phpunit"
+        - SYMFONY_REQUIRE='>=3.4'
+
+matrix:
+    fast_finish: true
+    include:
+        - php: 7.1.33
+        - php: 7.3
+        - php: 7.3
+          env: MAKER_TEST_VERSION=dev
+    allow_failures:
+        - php: 7.3
+          env: MAKER_TEST_VERSION=dev
 
 before_install:
-    - phpenv config-rm xdebug.ini || echo "xdebug not available"
+    - find ~/.phpenv -name xdebug.ini -delete
+    - composer global require --no-progress --no-scripts --no-plugins symfony/flex dev-master
+    - composer update
 
 install:
-    - composer update --no-suggest
     - ./vendor/bin/simple-phpunit install
 
 script:
-    - ./vendor/bin/simple-phpunit
+    - composer validate --strict --no-check-lock
+    - ./vendor/bin/simple-phpunit $PHPUNIT_FLAGS
     - ./vendor/bin/php-cs-fixer fix --dry-run --diff

CHANGELOG.md

@@ -1,3 +1,36 @@
+1.13
+====
+
+* [make:functional-test] Use Panther when available - #417
+  thanks to @adrienlucas
+
+* Allow rehashing passwords when possible and needed - #389
+  thanks to @nicolas-grekas
+
+1.12
+====
+
+* Use `[make:*-test]` Use the new WebTestAssertionsTrait methods in the generated
+  functional tests - #381 thanks to @adrienlucas
+
+* Add a agree terms checkbox to `make:registration-form` - #394
+  thanks to @ismail1432
+
+* Template generation respects `twig.default_path` - #346
+  thanks to @LeJeanbono
+
+* [Serializer] Normalizer now implements CacheableSupportsMethodInterface
+  with condition - #399 thanks to @jojotjebaby
+
+* Deprecate Argon2i encoder used in `make:user` and use
+  `auto` instead - #398 thanks to @nicolas-grekas
+
+* [make:auth] Added logout support and help for logged in user -
+  in #406 thanks to @St0iK
+
+* Use new event class names instead of strings in `make:event-subscriber` -
+  in #403 thanks to @jojotjebaby
+
 1.11
 ====
 

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2004-2017 Fabien Potencier
+Copyright (c) 2004-2019 Fabien Potencier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

appveyor.yml

@@ -49,6 +49,7 @@ install:
     - IF %PHP%==0 echo @php %%~dp0composer.phar %%* > composer.bat
     - appveyor-retry appveyor DownloadFile https://getcomposer.org/composer.phar
     - cd C:\projects\maker-bundle
+    - composer global require --no-progress --no-scripts --no-plugins symfony/flex dev-master
     - IF %dependencies%==highest appveyor-retry composer update --no-progress --no-suggest --ansi
     - vendor/bin/simple-phpunit install
 

composer.json

@@ -11,26 +11,29 @@
             "homepage": "https://symfony.com/contributors"
         }
     ],
+    "minimum-stability": "dev",
     "require": {
         "php": "^7.0.8",
         "doctrine/inflector": "^1.2",
         "nikic/php-parser": "^4.0",
-        "symfony/config": "^3.4|^4.0",
-        "symfony/console": "^3.4|^4.0",
-        "symfony/dependency-injection": "^3.4|^4.0",
-        "symfony/filesystem": "^3.4|^4.0",
-        "symfony/finder": "^3.4|^4.0",
-        "symfony/framework-bundle": "^3.4|^4.0",
-        "symfony/http-kernel": "^3.4|^4.0"
+        "symfony/config": "^3.4|^4.0|^5.0",
+        "symfony/console": "^3.4|^4.0|^5.0",
+        "symfony/dependency-injection": "^3.4|^4.0|^5.0",
+        "symfony/filesystem": "^3.4|^4.0|^5.0",
+        "symfony/finder": "^3.4|^4.0|^5.0",
+        "symfony/framework-bundle": "^3.4|^4.0|^5.0",
+        "symfony/http-kernel": "^3.4|^4.0|^5.0"
     },
     "require-dev": {
-        "allocine/twigcs": "^3.0",
-        "doctrine/doctrine-bundle": "^1.8",
+        "doctrine/doctrine-bundle": "^1.8|^2.0",
         "doctrine/orm": "^2.3",
         "friendsofphp/php-cs-fixer": "^2.8",
-        "symfony/phpunit-bridge": "^3.4|^4.0",
-        "symfony/process": "^3.4|^4.0",
-        "symfony/yaml": "^3.4|^4.0"
+        "friendsoftwig/twigcs": "^3.1.2",
+        "symfony/http-client": "^4.3|^5.0",
+        "symfony/phpunit-bridge": "^4.3|^5.0",
+        "symfony/process": "^3.4|^4.0|^5.0",
+        "symfony/security-core": "^3.4|^4.0|^5.0",
+        "symfony/yaml": "^3.4|^4.0|^5.0"
     },
     "config": {
         "preferred-install": "dist",

phpunit.xml.dist

@@ -6,12 +6,12 @@
          backupGlobals="false"
          colors="true"
          bootstrap="vendor/autoload.php"
+         failOnRisky="true"
+         failOnWarning="true"
 >
     <php>
         <ini name="error_reporting" value="-1" />
         <env name="TEST_DATABASE_DSN" value="mysql://root:@127.0.0.1:3306/test_maker" />
-        <!-- See #237 -->
-        <env name="SYMFONY_DEPRECATIONS_HELPER" value="weak_vendors" />
     </php>
 
     <testsuites>

src/ApplicationAwareMakerInterface.php

@@ -20,8 +20,5 @@
  */
 interface ApplicationAwareMakerInterface
 {
-    /**
-     * @param Application $application
-     */
     public function setApplication(Application $application);
 }

src/Command/MakerCommand.php

@@ -99,14 +99,16 @@ protected function interact(InputInterface $input, OutputInterface $output)
         $this->maker->interact($input, $this->io, $this);
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $this->maker->generate($input, $this->io, $this->generator);
 
         // sanity check for custom makers
         if ($this->generator->hasPendingOperations()) {
             throw new \LogicException('Make sure to call the writeChanges() method on the generator.');
         }
+
+        return 0;
     }
 
     public function setApplication(Application $application = null)

src/DependencyBuilder.php

@@ -136,7 +136,7 @@ private function calculateMissingDependencies(array $dependencies): array
         $missingPackages = [];
         $missingOptionalPackages = [];
         foreach ($dependencies as $package) {
-            if (class_exists($package['class']) || interface_exists($package['class'])) {
+            if (class_exists($package['class']) || interface_exists($package['class']) || trait_exists($package['class'])) {
                 continue;
             }
             if (true === $package['required']) {

src/DependencyInjection/CompilerPass/RemoveMissingParametersPass.php

@@ -0,0 +1,31 @@
+<?php
+
+/*
+ * This file is part of the Symfony MakerBundle package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\MakerBundle\DependencyInjection\CompilerPass;
+
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+/**
+ * Removes injected parameter arguments if they don't exist in this app.
+ *
+ * @author Ryan Weaver <[email protected]>
+ */
+class RemoveMissingParametersPass implements CompilerPassInterface
+{
+    public function process(ContainerBuilder $container)
+    {
+        if (!$container->hasParameter('twig.default_path')) {
+            $container->getDefinition('maker.file_manager')
+                ->replaceArgument(3, null);
+        }
+    }
+}

src/DependencyInjection/MakerExtension.php

@@ -40,6 +40,17 @@ public function load(array $configs, ContainerBuilder $container)
         $namespacesHelperDefinition = $container->getDefinition('maker.namespaces_helper');
         $namespacesHelperDefinition->replaceArgument(0, $config);
 
+        $rootNamespace = trim($config['root_namespace'], '\\');
+
+        $autoloaderFinderDefinition = $container->getDefinition('maker.autoloader_finder');
+        $autoloaderFinderDefinition->replaceArgument(0, $rootNamespace);
+
+        $makeCommandDefinition = $container->getDefinition('maker.generator');
+        $makeCommandDefinition->replaceArgument(1, $rootNamespace);
+
+        $doctrineHelperDefinition = $container->getDefinition('maker.doctrine_helper');
+        $doctrineHelperDefinition->replaceArgument(0, $rootNamespace.'\\Entity');
+
         $container->registerForAutoconfiguration(MakerInterface::class)
             ->addTag(MakeCommandRegistrationPass::MAKER_TAG);
     }

src/Doctrine/DoctrineHelper.php

@@ -11,16 +11,16 @@
 
 namespace Symfony\Bundle\MakerBundle\Doctrine;
 
+use Doctrine\Common\Persistence\ManagerRegistry;
 use Doctrine\Common\Persistence\Mapping\AbstractClassMetadataFactory;
+use Doctrine\Common\Persistence\Mapping\ClassMetadata;
 use Doctrine\Common\Persistence\Mapping\Driver\AnnotationDriver;
 use Doctrine\Common\Persistence\Mapping\Driver\MappingDriver;
 use Doctrine\Common\Persistence\Mapping\Driver\MappingDriverChain;
+use Doctrine\Common\Persistence\Mapping\MappingException as PersistenceMappingException;
 use Doctrine\ORM\EntityManagerInterface;
-use Doctrine\Common\Persistence\Mapping\ClassMetadata;
 use Doctrine\ORM\Mapping\MappingException as ORMMappingException;
-use Doctrine\Common\Persistence\Mapping\MappingException as PersistenceMappingException;
 use Doctrine\ORM\Tools\DisconnectedClassMetadataFactory;
-use Symfony\Bridge\Doctrine\ManagerRegistry;
 use Symfony\Bundle\MakerBundle\Util\ClassNameDetails;
 use Symfony\Bundle\MakerBundle\Util\NamespacesHelper;
 
@@ -75,8 +75,6 @@ public function getEntityNamespace(): string
     }
 
     /**
-     * @param string $className
-     *
      * @return MappingDriver|null
      *
      * @throws \Exception
@@ -123,9 +121,6 @@ public function getEntitiesForAutocomplete(): array
     }
 
     /**
-     * @param string|null $classOrNamespace
-     * @param bool        $disconnected
-     *
      * @return array|ClassMetadata
      */
     public function getMetadata(string $classOrNamespace = null, bool $disconnected = false)
@@ -185,8 +180,6 @@ public function getMetadata(string $classOrNamespace = null, bool $disconnected
     }
 
     /**
-     * @param string $entityClassName
-     *
      * @return EntityDetails|null
      */
     public function createDoctrineDetails(string $entityClassName)

src/Doctrine/EntityClassGenerator.php

@@ -26,7 +26,7 @@ public function __construct(Generator $generator)
         $this->generator = $generator;
     }
 
-    public function generateEntityClass(ClassNameDetails $entityClassDetails, bool $apiResource): string
+    public function generateEntityClass(ClassNameDetails $entityClassDetails, bool $apiResource, bool $withPasswordUpgrade = false): string
     {
         $repoClassDetails = $this->generator->createClassNameDetails(
             $entityClassDetails->getRelativeName(),
@@ -51,6 +51,7 @@ public function generateEntityClass(ClassNameDetails $entityClassDetails, bool $
                 'entity_full_class_name' => $entityClassDetails->getFullName(),
                 'entity_class_name' => $entityClassDetails->getShortName(),
                 'entity_alias' => $entityAlias,
+                'with_password_upgrade' => $withPasswordUpgrade,
             ]
         );
 

src/Doctrine/EntityRegenerator.php

@@ -234,6 +234,7 @@ private function generateRepository(ClassMetadata $metadata)
                 'entity_full_class_name' => $metadata->name,
                 'entity_class_name' => $entityClassName,
                 'entity_alias' => strtolower($entityClassName[0]),
+                'with_password_upgrade' => false,
             ]
         );
 

src/Doctrine/ORMDependencyBuilder.php

@@ -22,8 +22,6 @@ final class ORMDependencyBuilder
 {
     /**
      * Central method to add dependencies needed for Doctrine ORM.
-     *
-     * @param DependencyBuilder $dependencies
      */
     public static function buildDependencies(DependencyBuilder $dependencies)
     {