Merge branch 'feature/custom-namespaces-1' into feature/custom-namespaces

Author: natepage

.github/workflows/ci.yaml

@@ -16,18 +16,18 @@ jobs:
     coding-standards:
         name: "Coding Standards (${{ matrix.php-version }})"
 
-        runs-on: "ubuntu-18.04"
+        runs-on: ubuntu-latest
 
         strategy:
             fail-fast: false
             matrix:
                 php-version:
-                    - '8.0'
+                    - '8.1'
 
         steps:
             -
                 name: "Checkout code"
-                uses: "actions/checkout@v2"
+                uses: "actions/checkout@v3"
 
             -
                 name: "Install PHP"
@@ -42,13 +42,13 @@ jobs:
 
             -
                 name: "Composer install"
-                uses: "ramsey/composer-install@v1"
+                uses: "ramsey/composer-install@v2"
                 with:
                     composer-options: "--no-scripts"
 
             -
                 name: "Composer install php-cs-fixer"
-                uses: "ramsey/composer-install@v1"
+                uses: "ramsey/composer-install@v2"
                 with:
                     composer-options: "--no-scripts --working-dir=tools/php-cs-fixer"
 
@@ -59,7 +59,7 @@ jobs:
     test:
         name: "PHP ${{ matrix.php-version }} + @${{ matrix.symfony-version }} ${{ matrix.dependency-versions }} deps"
 
-        runs-on: ubuntu-18.04
+        runs-on: ubuntu-latest
 
         services:
             mysql:
@@ -90,28 +90,26 @@ jobs:
             fail-fast: false
             matrix:
                 php-version:
-                    - '8.1'
+                    - '8.2'
                 symfony-version:
-                    - '5.4.*'
-                    - '5.4.x-dev'
-                    - '6.0.x-dev'
-                    - '6.1.x-dev'
-                    - '6.2.x-dev'
+                    - '6.3.x-dev'
+                    - '6.4.x-dev'
+                    - '7.0.x-dev'
                 dependency-versions: ['highest']
                 allow-dev-deps-in-apps: ['0']
                 include:
-                    # testing lowest PHP version with LTS
-                    - php-version: '8.0.0'
-                      symfony-version: '5.4.*'
+                    # testing lowest PHP+dependencies with lowest Symfony
+                    - php-version: '8.1'
+                      symfony-version: '6.3.*'
                       dependency-versions: 'lowest'
-                    # testing lowest php version with highest 5.x stable
-                    - php-version: '8.0.0'
-                      symfony-version: '5.4.*'
+                    # testing lowest PHP+dependencies with highest Symfony
+                    - php-version: '8.1'
+                      symfony-version: '6.3.*'
                       dependency-versions: 'highest'
 
         steps:
             - name: "Checkout code"
-              uses: actions/checkout@v2.3.3
+              uses: actions/checkout@v3
 
             - name: "Start MySQL"
               run: |
@@ -136,17 +134,17 @@ jobs:
               run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
 
             - name: "Composer install"
-              uses: "ramsey/composer-install@v1"
+              uses: "ramsey/composer-install@v2"
               with:
                   dependency-versions: "${{ matrix.dependency-versions }}"
 
             - name: "Composer install php-cs-fixer"
-              uses: "ramsey/composer-install@v1"
+              uses: "ramsey/composer-install@v2"
               with:
                   composer-options: "--no-scripts --working-dir=tools/php-cs-fixer"
 
             - name: "Composer install twigcs"
-              uses: "ramsey/composer-install@v1"
+              uses: "ramsey/composer-install@v2"
               with:
                   composer-options: "--no-scripts --working-dir=tools/twigcs"
 

CHANGELOG.md

@@ -1,5 +1,58 @@
 # Changelog
 
+## [v1.50.0](https://github.com/symfony/maker-bundle/releases/tag/v1.50.0)
+
+### Feature
+
+- [#1328](https://github.com/symfony/maker-bundle/pull/1328) - Deleting save and remove methods from repositories - *@mdoutreluingne*
+- [#986](https://github.com/symfony/maker-bundle/pull/986) - Add RememberMeBadge - *@bechir*
+- [#1332](https://github.com/symfony/maker-bundle/pull/1332) - Add conditional @implements tag to Doctrine repository template - *@gremo*
+- [#1325](https://github.com/symfony/maker-bundle/pull/1325) - Fix English typo in reset password template - *@pbek*
+
+### Bug
+
+- [#1322](https://github.com/symfony/maker-bundle/pull/1322) - [make:crud] fix typo in Kernel::VERSION usage - *@nacorp*
+- [#1324](https://github.com/symfony/maker-bundle/pull/1324) - Fix(Doctrine Repository template)/Avoid potential double call in save method - *@Mano-Lis*
+- [#1293](https://github.com/symfony/maker-bundle/pull/1293) - [make:entity] don't set array field default value for nullable column - *@Rootie*
+
+## [v1.49.0](https://github.com/symfony/maker-bundle/releases/tag/v1.49.0)
+
+*June 7th, 2023*
+
+### Feature
+
+- [#1321](https://github.com/symfony/maker-bundle/pull/1321) - Changing make:stimulus-controller to require StimulusBundle - *@weaverryan*
+- [#1309](https://github.com/symfony/maker-bundle/pull/1309) - Apply `get_class_to_class_keyword` PHP-CS-Fixer rule - *@seb-jean*
+- [#1276](https://github.com/symfony/maker-bundle/pull/1276) - [make:migration] Change message when required package for migration doesn't exist. - *@bdaler*
+- [#1261](https://github.com/symfony/maker-bundle/pull/1261) - [make:registration-form] use UniqueEntity attribute instead of annotation - *@jrushlow*
+- [#1253](https://github.com/symfony/maker-bundle/pull/1253) - [make:migration] Add link to new migration files - *@nicolas-grekas*
+- [#1251](https://github.com/symfony/maker-bundle/pull/1251) - [make:*] use php-cs-fixer to style/lint all generated php templates - *@jrushlow*
+- [#1244](https://github.com/symfony/maker-bundle/pull/1244) - [make:security:form-login] new maker to use built in FormLogin - *@jrushlow*
+- [#1242](https://github.com/symfony/maker-bundle/pull/1242) - [make:*] use static return type instead of self for setters - *@jrushlow*
+- [#1239](https://github.com/symfony/maker-bundle/pull/1239) - Improve error messages to show PHP & XML configurations are not supported - *@ThomasLandauer*
+- [#1238](https://github.com/symfony/maker-bundle/pull/1238) - [make:*] improve output messages for Symfony CLI users - *@jrushlow*
+- [#1237](https://github.com/symfony/maker-bundle/pull/1237) - [make:registration-form] Print registration form errors - *@comxd*
+### Bug
+
+- [#1307](https://github.com/symfony/maker-bundle/pull/1307) - [make:twig-component] handle upstream changes to how live components are rendered - *@jrushlow*
+- [#1270](https://github.com/symfony/maker-bundle/pull/1270) - [make:authenticator] Core\Security or SecurityBundle\Security - Avoid deprecations in 6.2 - *@nacorp*
+- [#1265](https://github.com/symfony/maker-bundle/pull/1265) - [make:crud] Make sensio/framework-extra-bundle an optional dependency - *@acrobat*
+- [#1264](https://github.com/symfony/maker-bundle/pull/1264) - [make:controller] doctrine/annotations is not needed - *@jrushlow*
+- [#1262](https://github.com/symfony/maker-bundle/pull/1262) - [make:reset-password] doctrine/annotations are not needed - *@jrushlow*
+
+## [v1.48.0](https://github.com/symfony/maker-bundle/releases/tag/v1.48.0)
+
+*November 14th, 2022*
+
+### Feature
+
+- [#1221](https://github.com/symfony/maker-bundle/pull/1221) - [make:voter] Set type for subject in Voter template - *@N-M*
+### Bug
+
+- [#1232](https://github.com/symfony/maker-bundle/pull/1232) - [make:entity] Minor: Consistent output formatting - *@ThomasLandauer*
+- [#1227](https://github.com/symfony/maker-bundle/pull/1227) - [make:registration] Make router optional in MakeRegistrationForm constructor - *@odolbeau*
+- [#1226](https://github.com/symfony/maker-bundle/pull/1226) - [make:controller] replace repository method add by save - *@bechir*
+
 ## [v1.47.0](https://github.com/symfony/maker-bundle/releases/tag/v1.47.0)
 
 *October 4th, 2022*

appveyor.yml

@@ -27,7 +27,7 @@ environment:
     TEST_DATABASE_DSN: mysql://root:[email protected]:3306/test_maker
     matrix:
       - dependencies: highest
-        php_ver_target: 8.0.19
+        php_ver_target: 8.1.23
 
 install:
     - choco install sqlite --params "/NoTools"

composer.json

@@ -4,7 +4,7 @@
     "name": "symfony/maker-bundle",
     "type": "symfony-bundle",
     "license": "MIT",
-    "keywords": ["generator", "code generator", "scaffolding", "scaffold"],
+    "keywords": ["generator", "code generator", "scaffolding", "scaffold", "dev"],
     "authors": [
         {
             "name": "Symfony Community",
@@ -13,28 +13,27 @@
     ],
     "minimum-stability": "dev",
     "require": {
-        "php": ">=8.0",
+        "php": ">=8.1",
         "doctrine/inflector": "^2.0",
         "nikic/php-parser": "^4.11",
-        "symfony/config": "^5.4.7|^6.0",
-        "symfony/console": "^5.4.7|^6.0",
-        "symfony/dependency-injection": "^5.4.7|^6.0",
+        "symfony/config": "^6.3|^7.0",
+        "symfony/console": "^6.3|^7.0",
+        "symfony/dependency-injection": "^6.3|^7.0",
         "symfony/deprecation-contracts": "^2.2|^3",
-        "symfony/filesystem": "^5.4.7|^6.0",
-        "symfony/finder": "^5.4.3|^6.0",
-        "symfony/framework-bundle": "^5.4.7|^6.0",
-        "symfony/http-kernel": "^5.4.7|^6.0"
+        "symfony/filesystem": "^6.3|^7.0",
+        "symfony/finder": "^6.3|^7.0",
+        "symfony/framework-bundle": "^6.3|^7.0",
+        "symfony/http-kernel": "^6.3|^7.0",
+        "symfony/process": "^6.3|^7.0"
     },
     "require-dev": {
         "composer/semver": "^3.0",
-        "doctrine/doctrine-bundle": "^2.4",
+        "doctrine/doctrine-bundle": "^2.5.0",
         "doctrine/orm": "^2.10.0",
-        "symfony/http-client": "^5.4.7|^6.0",
-        "symfony/phpunit-bridge": "^5.4.7|^6.0",
-        "symfony/polyfill-php80": "^1.16.0",
-        "symfony/process": "^5.4.7|^6.0",
-        "symfony/security-core": "^5.4.7|^6.0",
-        "symfony/yaml": "^5.4.3|^6.0",
+        "symfony/http-client": "^6.3|^7.0",
+        "symfony/phpunit-bridge": "^6.3|^7.0",
+        "symfony/security-core": "^6.3|^7.0",
+        "symfony/yaml": "^6.3|^7.0",
         "twig/twig": "^2.0|^3.0"
     },
     "config": {
@@ -43,8 +42,7 @@
     },
     "conflict": {
         "doctrine/orm": "<2.10",
-        "doctrine/doctrine-bundle": "<2.4",
-        "symfony/doctrine-bridge": "<5.4"
+        "doctrine/doctrine-bundle": "<2.4"
     },
     "autoload": {
         "psr-4": { "Symfony\\Bundle\\MakerBundle\\": "src/" }
@@ -54,7 +52,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-main": "1.0-dev"
+            "dev-main": "1.x-dev"
         }
     }
 }

src/Command/MakerCommand.php

@@ -19,6 +19,7 @@
 use Symfony\Bundle\MakerBundle\Generator;
 use Symfony\Bundle\MakerBundle\InputConfiguration;
 use Symfony\Bundle\MakerBundle\MakerInterface;
+use Symfony\Bundle\MakerBundle\Util\TemplateLinter;
 use Symfony\Bundle\MakerBundle\Validator;
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Command\Command;
@@ -36,8 +37,12 @@ final class MakerCommand extends Command
     private ConsoleStyle $io;
     private bool $checkDependencies = true;
 
-    public function __construct(private MakerInterface $maker, private FileManager $fileManager, private Generator $generator)
-    {
+    public function __construct(
+        private MakerInterface $maker,
+        private FileManager $fileManager,
+        private Generator $generator,
+        private TemplateLinter $linter,
+    ) {
         $this->inputConfig = new InputConfiguration();
 
         parent::__construct();
@@ -90,13 +95,19 @@ protected function interact(InputInterface $input, OutputInterface $output): voi
 
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
+        if ($output->isVerbose()) {
+            $this->linter->writeLinterMessage($output);
+        }
+
         $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.');
         }
 
+        $this->linter->lintFiles($this->generator->getGeneratedFiles());
+
         return 0;
     }
 

src/Console/MigrationDiffFilteredOutput.php

@@ -14,38 +14,7 @@
 use Symfony\Component\Console\Formatter\OutputFormatterInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
-// look for the "string|iterable" type on OutputInterface::write()
-// @legacy - Use MigrationDiffFilteredOutput_php8 when Symfony 5.4 is no longer supported
-if (!(new \ReflectionMethod(OutputInterface::class, 'write'))->getParameters()[0]->getType()) {
-    class MigrationDiffFilteredOutput implements OutputInterface
-    {
-        use BaseMakerMigrationDiffFilteredOuputTrait;
-
-        public function write($messages, $newline = false, $options = 0)
-        {
-            $this->_write($messages, $newline, $options);
-        }
-
-        public function writeln($messages, $options = 0)
-        {
-            $this->_writeln($messages, $options);
-        }
-
-        public function setVerbosity($level)
-        {
-            $this->output->setVerbosity($level);
-        }
-
-        public function setDecorated($decorated)
-        {
-            $this->output->setDecorated($decorated);
-        }
-    }
-} else {
-    require __DIR__.'/MigrationDiffFilteredOutput_php8';
-}
-
-trait BaseMakerMigrationDiffFilteredOuputTrait
+class MigrationDiffFilteredOutput implements OutputInterface
 {
     private string $buffer = '';
     private bool $previousLineWasRemoved = false;
@@ -55,20 +24,30 @@ public function __construct(
     ) {
     }
 
-    public function _write($messages, bool $newline = false, $options = 0)
+    public function write($messages, bool $newline = false, $options = 0): void
     {
         $messages = $this->filterMessages($messages, $newline);
 
         $this->output->write($messages, $newline, $options);
     }
 
-    public function _writeln($messages, int $options = 0)
+    public function writeln($messages, int $options = 0): void
     {
         $messages = $this->filterMessages($messages, true);
 
         $this->output->writeln($messages, $options);
     }
 
+    public function setVerbosity(int $level): void
+    {
+        $this->output->setVerbosity($level);
+    }
+
+    public function setDecorated(bool $decorated): void
+    {
+        $this->output->setDecorated($decorated);
+    }
+
     public function getVerbosity(): int
     {
         return $this->output->getVerbosity();
@@ -99,7 +78,7 @@ public function isDecorated(): bool
         return $this->output->isDecorated();
     }
 
-    public function setFormatter(OutputFormatterInterface $formatter)
+    public function setFormatter(OutputFormatterInterface $formatter): void
     {
         $this->output->setFormatter($formatter);
     }