Merge branch 'master' into ancestor_class_underscore

Author: shakaran

.github/workflows/build.yaml

@@ -6,66 +6,101 @@ on:
 
 jobs:
     check:
-        runs-on: ubuntu-20.04
+        runs-on: ubuntu-24.04
         steps:
             - name: Checkout
-              uses: actions/checkout@v2
+              uses: actions/checkout@v6
             - name: Setup PHP
               uses: shivammathur/setup-php@v2
             - name: Validate composer.json
               run: composer validate --strict --no-check-lock
     cs-fixer:
-        runs-on: ubuntu-20.04
+        runs-on: ubuntu-24.04
         name: PHP-CS-Fixer
         steps:
             - name: Checkout
-              uses: actions/checkout@v2
+              uses: actions/checkout@v6
             - name: Fix CS
               uses: docker://oskarstark/php-cs-fixer-ga
+    twig-cs-fixer:
+        runs-on: ubuntu-24.04
+        name: Twig-CS-Fixer
+        steps:
+            - name: Checkout
+              uses: actions/checkout@v6
+            - name: Require the vendor
+              run: composer require --dev --no-update vincentlanglet/twig-cs-fixer ^3.5
+            - name: Update
+              run: composer update --no-interaction --no-progress
+            - name: Run
+              run: vendor/bin/twig-cs-fixer lint src/Knp/Menu/Resources/views
     tests:
-        runs-on: ubuntu-20.04
+        runs-on: ubuntu-24.04
         strategy:
             fail-fast: false
             matrix:
                 include:
                     - description: 'No Symfony specified'
-                      php: '7.3'
+                      php: '8.1'
+                      max_deprecations: 0
+                    - description: 'No Symfony specified'
+                      php: '8.2'
+                      max_deprecations: 0
                     - description: 'No Symfony specified'
-                      php: '7.4'
+                      php: '8.3'
+                      max_deprecations: 0
                     - description: 'No Symfony specified'
-                      php: '8.0'
+                      php: '8.4'
+                      max_deprecations: 0
+                    - description: 'No Symfony specified'
+                      php: '8.5'
+                      max_deprecations: 0
                     - description: 'Lowest deps'
-                      php: '7.3'
+                      php: '8.1'
                       composer_option: '--prefer-lowest'
-                      env:
-                          SYMFONY_DEPRECATIONS_HELPER: max[self]=0
-                    - description: 'Symfony 4.4'
-                      php: '7.4'
-                      symfony: 4.4.*
-                    - description: 'Symfony 5.3'
-                      php: '7.4'
-                      symfony: 5.3.*
+                      max_deprecations: 0
+                    - description: 'Symfony 6'
+                      php: '8.1'
+                      symfony: 6.4.*
+                      max_deprecations: 0
                     - description: 'Dev deps'
-                      php: '8.0'
+                      php: '8.4'
                       dev: true
+                      max_deprecations: 0
         name: PHP ${{ matrix.php }} tests (${{ matrix.description }})
         steps:
             - name: Checkout
-              uses: actions/checkout@v2
+              uses: actions/checkout@v6
             - name: Cache
-              uses: actions/cache@v2
-              with: 
+              uses: actions/cache@v4
+              with:
                   path: ~/.composer/cache/files
-                  key: composer-${{ matrix.php }}-${{ matrix.symfony }}-${{ matrix.composer_option }} 
+                  key: composer-${{ matrix.php }}-${{ matrix.symfony }}-${{ matrix.composer_option }}
             - name: Setup PHP
               uses: shivammathur/setup-php@v2
               with:
                   php-version: ${{ matrix.php }}
             - run: |
                    sed -ri '/symfony\/deprecation-contracts/! s/"symfony\/(.+)": "(.+)"/"symfony\/\1": "'${{ matrix.symfony }}'"/' composer.json;
+            - run: composer config --global --no-plugins allow-plugins.symfony/flex true && composer global require symfony/flex
+              if: matrix.symfony
+            - run: echo 'SYMFONY_REQUIRE=${{ matrix.symfony }}' >> "$GITHUB_ENV"
               if: matrix.symfony
-            - run: composer config minimum-stability dev && composer config prefer-stable true
+            - run: composer config minimum-stability dev
               if: matrix.dev
             - run: composer update --no-interaction --no-progress --ansi ${{ matrix.composer_option }}
-            - run: vendor/bin/simple-phpunit
-
+            - run: vendor/bin/phpunit
+              env:
+                 SYMFONY_DEPRECATIONS_HELPER: max[self]=${{matrix.max_deprecations}}
+    phpstan:
+        runs-on: ubuntu-24.04
+        name: PHPStan
+        steps:
+            - name: Checkout
+              uses: actions/checkout@v6
+            - name: Setup PHP
+              uses: shivammathur/setup-php@v2
+              with:
+                  php-version: '8.1'
+            - run: composer update --no-interaction --no-progress --ansi
+            - run: vendor/bin/phpstan analyze

.php-cs-fixer.php

@@ -10,8 +10,8 @@
     ->setRules([
         '@Symfony' => true,
         '@Symfony:risky' => true,
-        '@PHP71Migration:risky' => true,
-        '@PHPUnit75Migration:risky' => true,
+        '@PHP80Migration:risky' => true,
+        '@PHPUnit84Migration:risky' => true,
         'ordered_imports' => true,
         'declare_strict_types' => false,
         'native_function_invocation' => ['include' => ['@internal']],

CHANGELOG.md

@@ -1,3 +1,16 @@
+## 3.5 (2024-03-23)
+
+* Added CallbackVoter
+* Removed support for unsupported PHP version 8.0
+
+## 3.4 (2023-05-17)
+
+* Removed support for unsupported PHP version 7.4
+
+## 3.3 (2021-10-28)
+
+* Added support for Symfony 6
+
 ## 3.2 (2021-05-28)
 
 * Remove Symfony 6 deprecations
@@ -42,7 +55,7 @@
 * Added 2 new tests to twig: `knp_menu_current`, `knp_menu_ancestor`
 * Made the templates compatible with Twig 2
 * Add menu and renderer providers supporting any ArrayAccess implementations. The
-  Pimple-based providers (supporting only Pimple 1) are dperecated in favor of these
+  Pimple-based providers (supporting only Pimple 1) are deprecated in favor of these
   new providers.
 
 ## 2.0.1 (2014-08-01)
@@ -61,7 +74,7 @@
 ## 2.0.0 alpha 2 (2014-05-01)
 
 * [BC break] Changed the TwigRenderer to accept a menu template only as a string
-* [BC break] Refactored the way of rendering twig templates. Every template should extends
+* [BC break] Refactored the way of rendering twig templates. Every template should extend
   the `knp_menu.html.twig` template.
 * Introduced extension points in the MenuFactory through `Knp\Menu\Factory\ExtensionInterface`
 * [BC break compared to 2.0 alpha 1] The inheritance extension points introduced in alpha1 are
@@ -99,7 +112,7 @@
     )
     ```
 
-    The old syntax is kept until the final release, but using it will trigger a E_USER_DEPRECATED error.
+    The old syntax is kept until the final release, but using it will trigger an E_USER_DEPRECATED error.
 
 ## 2.0.0 alpha 1 (2013-06-23)
 
@@ -151,7 +164,7 @@
 * Added a ChainProvider for the menus.
 * Added the Silex extension
 * Added a RouterAwareFactory
-* Added an helper to be able to reuse the logic more easily for other templating engines
+* Added a helper to be able to reuse the logic more easily for other templating engines
 * Added a way to retrieve an item using a path in a menu tree
 * Changed the toArray method to use a depth instead of simply using a boolean flag
 * Refactored the export to array and the creation from an array

README.markdown

@@ -1,24 +1,23 @@
-KnpMenu
-=======
+# KnpMenu
 
-The KnpMenu library provides object oriented menus for PHP.
+The KnpMenu library provides object-oriented menus for PHP.
 It is used by the [KnpMenuBundle](https://github.com/KnpLabs/KnpMenuBundle) for Symfony
 but can now be used stand-alone.
 
-[![Build Status](https://github.com/KnpLabs/KnpMenu/workflows/build/badge.svg)](https://github.com/KnpLabs/KnpMenu/actions)
+[![Build Status](https://github.com/KnpLabs/KnpMenu/actions/workflows/build.yaml/badge.svg)](https://github.com/KnpLabs/KnpMenu/actions/workflows/build.yaml)
 [![Latest Stable Version](https://poser.pugx.org/knplabs/knp-menu/v/stable.svg)](https://packagist.org/packages/knplabs/knp-menu)
 [![Latest Unstable Version](https://poser.pugx.org/knplabs/knp-menu/v/unstable.svg)](https://packagist.org/packages/knplabs/knp-menu)
 [![Gitter chat](https://badges.gitter.im/KnpLabs/KnpMenu.svg)](https://gitter.im/KnpLabs/KnpMenu)
 
 ## Installation
 
-KnpMenu uses Composer, please checkout the [composer website](http://getcomposer.org) for more information.
+KnpMenu uses Composer, please check out the [composer website](https://getcomposer.org/) for more information.
 
-The simple following command will install `knp-menu` into your project. It also add a new
+The simple following command will install `knp-menu` into your project. It also adds a new
 entry in your `composer.json` and update the `composer.lock` as well.
 
 ```bash
-$ composer require knplabs/knp-menu
+composer require knplabs/knp-menu
 ```
 
 > KnpMenu follows the PSR-4 convention names for its classes, which means you can easily integrate `knp-menu` classes loading in your own autoloader.
@@ -96,3 +95,4 @@ the [Symfony community](https://github.com/KnpLabs/KnpMenu/graphs/contributors).
 [3]: https://github.com/derrabus
 [4]: https://github.com/garak
 [5]: https://github.com/stof
+

composer.json

@@ -20,19 +20,21 @@
         }
     ],
     "require": {
-        "php": "^7.3 || ^8.0",
+        "php": "^8.1",
         "symfony/deprecation-contracts": "^2.4"
     },
     "conflict": {
-        "twig/twig": "<1.40 || >=2,<2.9"
+        "symfony/http-foundation": "<5.4",
+        "twig/twig": "<2.16"
     },
     "require-dev": {
-        "phpspec/prophecy": "^1.13",
-        "psr/container": "^1.0",
-        "symfony/http-foundation": "^4.4 || ^5.0",
-        "symfony/phpunit-bridge": "^5.3",
-        "symfony/routing": "^4.4 || ^5.0",
-        "twig/twig": "^1.40 || ^2.9 || ^3.0"
+        "phpstan/phpstan": "^2.1",
+        "phpunit/phpunit": "^9.6",
+        "psr/container": "^1.0 || ^2.0",
+        "symfony/http-foundation": "^5.4 || ^6.0 || ^7.0 || ^8.0",
+        "symfony/phpunit-bridge": "^7.0 || ^8.0",
+        "symfony/routing": "^5.4 || ^6.0 || ^7.0 || ^8.0",
+        "twig/twig": "^2.16 || ^3.0"
     },
     "suggest": {
         "twig/twig": "for the TwigRenderer and the integration with your templates"
@@ -45,9 +47,12 @@
             "Knp\\Menu\\Tests\\": "tests/Knp/Menu/Tests"
         }
     },
+    "config": {
+        "sort-packages": true
+    },
     "extra": {
         "branch-alias": {
-            "dev-master": "3.3-dev"
+            "dev-master": "3.x-dev"
         }
     }
 }