Merge branch 'symfony:1.x' into main

Author: pkly

.github/workflows/ci-docs.yaml

@@ -4,7 +4,7 @@ on:
   pull_request:
   push:
     branches:
-      - 'main'
+      - '1.x'
   schedule:
     -   cron: '0 0 * * *'
 

.github/workflows/ci-linux.yaml

@@ -4,10 +4,14 @@ on:
     pull_request:
     push:
         branches:
-            - 'main'
+            - '1.x'
     schedule:
         -   cron: '0 0 * * *'
 
+concurrency:
+    group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+    cancel-in-progress: true
+
 env:
     PHPUNIT_FLAGS: "-v"
     SYMFONY_PHPUNIT_DIR: "$HOME/symfony-bridge/.phpunit"
@@ -33,28 +37,21 @@ jobs:
 
         env:
             SYMFONY_VERSION: ${{ matrix.symfony-version }}
-            MAKER_ALLOW_DEV_DEPS_IN_APP: ${{ matrix.allow-dev-deps-in-apps }}
 
         strategy:
             fail-fast: false
             matrix:
                 php-version:
                     - '8.3'
                 symfony-version:
-                    - '6.4.x-dev'
-                    - '7.0.x-dev'
-                    - '7.1.x-dev'
+                    - '6.4.*'
+                    - '7.2.*'
                 dependency-versions: ['highest']
-                allow-dev-deps-in-apps: ['0']
                 include:
                     # testing lowest PHP+dependencies with lowest Symfony
                     - php-version: '8.1'
                       symfony-version: '6.4.*'
                       dependency-versions: 'lowest'
-                    # testing lowest PHP+dependencies with highest Symfony
-                    - php-version: '8.1'
-                      symfony-version: '6.4.*'
-                      dependency-versions: 'highest'
 
         steps:
             - name: Checkout code
@@ -63,8 +60,9 @@ jobs:
             - name: Install PHP with extensions
               uses: shivammathur/setup-php@v2
               with:
-                  coverage: "none"
+                  coverage: none
                   php-version: ${{ matrix.php-version }}
+                  tools: flex
 
             - name: Add PHPUnit matcher
               run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
@@ -86,9 +84,6 @@ jobs:
 
             - name: Install PHPUnit
               run: |
-                if [[ ${{ matrix.dependency_versions == 'lowest' }} ]]; then
-                  echo "SYMFONY_PHPUNIT_REQUIRE=nikic/php-parser:^4.18" >> $GITHUB_ENV
-                fi
                 vendor/bin/simple-phpunit install
 
             - name: PHPUnit version

.github/workflows/ci-static-analysis.yaml

@@ -4,7 +4,7 @@ on:
     pull_request:
     push:
         branches:
-            - 'main'
+            - '1.x'
     schedule:
         -   cron: '0 0 * * *'
 

.github/workflows/ci-windows.yaml

@@ -4,19 +4,21 @@ on:
     pull_request:
     push:
         branches:
-            - 'main'
+            - '1.x'
     schedule:
         -   cron: '0 0 * * *'
 
+concurrency:
+    group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+    cancel-in-progress: true
+
 env:
     PHPUNIT_FLAGS: "-v"
     SYMFONY_PHPUNIT_DIR: "$HOME/symfony-bridge/.phpunit"
     MAKER_SKIP_MERCURE_TEST: 1
     MAKER_SKIP_PANTHER_TEST: 1
     MAKER_TEST_WINDOWS: 1
     MAKER_DISABLE_FILE_LINKS: 1
-    MAKER_ALLOW_DEV_DEPS_IN_APP: 0
-    SYMFONY_VERSION: '7.0.x-dev'
 
 jobs:
     tests:

.symfony.bundle.yaml

@@ -1,6 +1,6 @@
-branches: ["main"]
+branches: ["1.x"]
 
-maintained_branches: ["main"]
+maintained_branches: ["1.x"]
 
 doc_dir: "docs"
 

CHANGELOG.md

@@ -35,17 +35,17 @@ This is not needed for contributing, but it's useful if you would like to debug
 issue in the docs or if you want to read MakerBundles Documentation offline.
 
 ```bash
-$ cd _docs_build/
+cd _docs_build/
 
-$ composer install
+composer install
 
-$ php build.php
+php build.php
 ```
 
 After generating docs, serve them with the internal PHP server:
 
 ```bash
-$ php -S localhost:8000 -t output/
+php -S localhost:8000 -t output/
 ```
 
 Browse `http://localhost:8000` to read the docs.

README.md

@@ -12,10 +12,11 @@
         }
     ],
     "minimum-stability": "dev",
+    "prefer-stable": true,
     "require": {
         "php": ">=8.1",
         "doctrine/inflector": "^2.0",
-        "nikic/php-parser": "^4.18|^5.0",
+        "nikic/php-parser": "^5.0",
         "symfony/config": "^6.4|^7.0",
         "symfony/console": "^6.4|^7.0",
         "symfony/dependency-injection": "^6.4|^7.0",

composer.json

@@ -3,6 +3,6 @@ by asking questions.
 
 It can provide an empty authenticator, or a full login form authentication process.
 In both cases it also updates your <info>security.yaml</info>.
-For the login form, it also generates a controller and the twig template.
+For the login form, it also generates a controller and the Twig template.
 
 <info>php %command.full_name%</info>

config/help/MakeAuth.txt

@@ -1,16 +1,16 @@
 The <info>%command.name%</info> command generates a new form class.
 
-<info>php %command.full_name% UserType</info>
+<info>php %command.full_name% UserForm</info>
 
 If the argument is missing, the command will ask for the form class interactively.
 
 You can optionally specify the bound class in a second argument.
 This can be the name of an entity like <info>User</info>
 
-<info>php %command.full_name% UserType User</info>
+<info>php %command.full_name% UserForm User</info>
 
 You can also specify a fully qualified name to another class like <info>\App\Dto\UserData</info>.
 Slashes must be escaped in the argument.
 
-<info>php %command.full_name% UserType \\App\\Dto\\UserData</info>
+<info>php %command.full_name% UserForm \\App\\Dto\\UserData</info>