Merge release 2.8.0 into 3.0.x #566

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open

github-actions wants to merge 45 commits into 3.0.x from 2.8.x-merge-up-into-3.0.x_ssjkQpTc

.gitattributes

-Original file line number
+Diff line change
@@ -1,10 +1,7 @@
     .*                      export-ignore
-    infection.json          export-ignore
     Makefile                export-ignore
     phpstan.neon.dist       export-ignore
     phpstan-baseline.neon   export-ignore
-    psalm-baseline.xml      export-ignore
-    psalm.xml               export-ignore
     phpunit.xml.dist        export-ignore
     /docs                   export-ignore
     /tests                  export-ignore
@@ Expand Down @@

.github/workflows/continuous-integration.yml

-Original file line number
+Diff line change
@@ Expand Up / @@ -13,6 +13,5 @@ jobs: @@
         uses: "nucleos/actions/.github/workflows/continuous-integration.yml@main"
         with:
           PHP_EXTENSIONS: "mbstring, json, mongodb"
-          SYMFONY_KERNEL: "Nucleos\\ProfileBundle\\Tests\\App\\AppKernel"
         secrets:
           CODECOV_TOKEN: "${{ secrets.CODECOV_TOKEN }}"

.php-cs-fixer.dist.php

-Original file line number
+Diff line change
@@ -1,8 +1,8 @@
     <?php
-    $header = <<<EOF
-    This file is part of the NucleosProfileBundle package.
+    use PhpCsFixer\Runner\Parallel\ParallelConfigFactory;
+    $header = <<<EOF
     (c) Christian Gripp <[email protected]>
     For the full copyright and license information, please view the LICENSE
@@ Expand All / @@ -13,7 +13,8 @@ @@
         ->in([ __DIR__.'/src',  __DIR__.'/tests'])
     ;
-    $config = (new PhpCsFixer\Config())
+    return (new PhpCsFixer\Config())
+        ->setParallelConfig(ParallelConfigFactory::detect())
         ->setRiskyAllowed(true)
         ->setRules([
             '@Symfony' => true,
@@ Expand Down Expand Up / @@ -43,15 +44,10 @@ @@
             ],
             'static_lambda' => true,
             'global_namespace_import' => [
-               'import_classes' => true,
-               'import_constants' => false,
-               'import_functions' => false,
-            ],
-            'phpdoc_to_comment' => [
-                'ignored_tags' => ['psalm-suppress'],
+                'import_classes' => true,
+                'import_constants' => false,
+                'import_functions' => false,
             ],
         ])
-        ->setFinder($finder)
-    ;
+        ->setFinder($finder);
-    return $config;

CHANGELOG.md

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -2,27 +2,28 @@
  
    All notable changes to this project will be documented in this file, in reverse chronological order by release.

    ## 2.4.0 - TBD

    ## 2.4.0 - 2023-08-10

    ### Added

    - Nothing.

    -----

    ### Changed

    ### Release Notes for [2.4.0](https://github.com/nucleos/NucleosProfileBundle/milestone/23)

    - Nothing.

    Feature release (minor)

    ### Deprecated

    ### 2.4.0

    - Nothing.

    - Total issues resolved: **0**

    - Total pull requests resolved: **2**

    - Total contributors: **1**

    ### Removed

    #### dependency

    - Nothing.

     - [514: Add support for nucleos/user-bundle 3](https://github.com/nucleos/NucleosProfileBundle/pull/514) thanks to @core23

    ### Fixed

    #### Enhancement

    - Nothing.

     - [513: Add &quot;User&quot; validation group to be compatible with upcoming user-bundle release](https://github.com/nucleos/NucleosProfileBundle/pull/513) thanks to @core23

    ## 2.3.0 - 2023-07-20

Makefile

-Original file line number
+Diff line change
@@ Expand Up / @@ -16,10 +16,6 @@ lint-composer: @@
     test: vendor-bin/tools/vendor
     	vendor/bin/phpunit --colors=always
-    .PHONY: infection
-    infection: vendor/bin/infection
-    	vendor/bin/infection --threads=4
     .PHONY: coverage
     coverage: vendor-bin/tools/vendor
     	vendor/bin/phpunit --colors=always --coverage-clover=build/logs/clover.xml
@@ Expand All / @@ -32,10 +28,6 @@ cs: vendor-bin/tools/vendor @@
     cs-fix: vendor-bin/tools/vendor
     	vendor/bin/php-cs-fixer fix --verbose
-    .PHONY: psalm
-    psalm: vendor-bin/tools/vendor
-    	vendor/bin/psalm --config=psalm.xml --diff --shepherd --show-info=false --stats --threads=4
     .PHONY: phpstan
     phpstan: vendor-bin/tools/vendor
     	vendor/bin/phpstan analyse
@@ Expand All / @@ -60,5 +52,3 @@ check-dependencies: vendor-bin/tools/vendor @@
     vendor-bin/tools/vendor:
     	composer --working-dir=vendor-bin/tools install
-    vendor/bin/infection: vendor-bin/tools/vendor
-    	wget -O vendor/bin/infection https://github.com/infection/infection/releases/latest/download/infection.phar && chmod +x vendor/bin/infection

README.md

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -9,9 +9,8 @@ NucleosProfileBundle
  
    [![Monthly Downloads](https://poser.pugx.org/nucleos/profile-bundle/d/monthly)](https://packagist.org/packages/nucleos/profile-bundle)

    [![Daily Downloads](https://poser.pugx.org/nucleos/profile-bundle/d/daily)](https://packagist.org/packages/nucleos/profile-bundle)

    [![Continuous Integration](https://github.com/nucleos/NucleosProfileBundle/workflows/Continuous%20Integration/badge.svg?event=push)](https://github.com/nucleos/NucleosProfileBundle/actions?query=workflow%3A"Continuous+Integration"+event%3Apush)

    [![Continuous Integration](https://github.com/nucleos/NucleosProfileBundle/actions/workflows/continuous-integration.yml/badge.svg?event=push)](https://github.com/nucleos/NucleosProfileBundle/actions?query=workflow%3A"Continuous+Integration"+event%3Apush)

    [![Code Coverage](https://codecov.io/gh/nucleos/NucleosProfileBundle/graph/badge.svg)](https://codecov.io/gh/nucleos/NucleosProfileBundle)

    [![Type Coverage](https://shepherd.dev/github/nucleos/NucleosProfileBundle/coverage.svg)](https://shepherd.dev/github/nucleos/NucleosProfileBundle)

    The NucleosProfileBundle is an extension for [NucleosUserBundle](https://github.com/nucleos/NucleosUserBundle/) which provides profile management and registration. This is a splitted fork of [FOSProfileBundle](https://github.com/FriendsOfSymfony/FOSProfileBundle/).

composer.json

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -35,43 +35,44 @@
  
            }

        ],

        "require": {

            "php": "^8.1",

            "doctrine/persistence": "^2.2.2 || ^3.0.0",

            "nucleos/user-bundle": "^2.0",

            "symfony/config": "^5.4 || ^6.2",

            "symfony/dependency-injection": "^5.4 || ^6.2",

            "symfony/event-dispatcher": "^5.4 || ^6.2",

            "php": "^8.3",

            "doctrine/persistence": "^4.0.0",

            "nucleos/user-bundle": "^3.7 || ^4.0",

            "symfony/config": "^6.4 || ^7.0",

            "symfony/dependency-injection": "^6.4 || ^7.0",

            "symfony/event-dispatcher": "^6.4 || ^7.0",

            "symfony/event-dispatcher-contracts": "^1.0 || ^2.0 || ^3.0",

            "symfony/form": "^5.4 || ^6.2",

            "symfony/framework-bundle": "^5.4.19 || ^6.2.5",

            "symfony/http-foundation": "^5.4 || ^6.2",

            "symfony/http-kernel": "^5.4 || ^6.2",

            "symfony/intl": "^5.4 || ^6.2",

            "symfony/mailer": "^5.4 || ^6.2",

            "symfony/mime": "^5.4 || ^6.2",

            "symfony/options-resolver": "^5.4 || ^6.2",

            "symfony/routing": "^5.4 || ^6.2",

            "symfony/security-core": "^5.4 || ^6.2",

            "symfony/translation": "^5.4 || ^6.2",

            "symfony/form": "^6.4 || ^7.0",

            "symfony/framework-bundle": "^6.4 || ^7.0",

            "symfony/http-foundation": "^6.4 || ^7.0",

            "symfony/http-kernel": "^6.4 || ^7.0",

            "symfony/intl": "^6.4 || ^7.0",

            "symfony/mailer": "^6.4 || ^7.0",

            "symfony/mime": "^6.4 || ^7.0",

            "symfony/options-resolver": "^6.4 || ^7.0",

            "symfony/routing": "^6.4 || ^7.0",

            "symfony/security-core": "^6.4 || ^7.0",

            "symfony/translation": "^6.4 || ^7.0",

            "symfony/translation-contracts": "^1.0 || ^2.0 || ^3.0",

            "symfony/twig-bridge": "^5.4 || ^6.2",

            "symfony/twig-bundle": "^5.4 || ^6.2",

            "symfony/validator": "^5.4 || ^6.2",

            "symfony/twig-bridge": "^6.4 || ^7.0",

            "symfony/twig-bundle": "^6.4 || ^7.0",

            "symfony/validator": "^6.4 || ^7.0",

            "twig/twig": "^2.14 || ^3.1"

        },

        "require-dev": {

            "alcaeus/mongo-php-adapter": "^1.1",

            "doctrine/doctrine-bundle": "^2.5",

            "doctrine/orm": "^2.7",

            "dama/doctrine-test-bundle": "^8.0",

            "doctrine/doctrine-bundle": "^2.18 || ^3.0",

            "doctrine/orm": "^2.18 || ^3.0",

            "ergebnis/composer-normalize": "^2.0.1",

            "symfony/browser-kit": "^5.4 || ^6.2",

            "symfony/doctrine-bridge": "^5.4 || ^6.2",

            "symfony/yaml": "^5.4 || ^6.2"

            "symfony/browser-kit": "^6.4 || ^7.0",

            "symfony/css-selector": "^6.4 || ^7.0",

            "symfony/doctrine-bridge": "^6.4 || ^7.0",

            "symfony/yaml": "^6.4 || ^7.0"

        },

        "conflict": {

            "doctrine/doctrine-bundle": "<2.5",

            "doctrine/orm": "<2.7",

            "symfony/doctrine-bridge": "<5.4"

            "doctrine/doctrine-bundle": "<2.18",

            "doctrine/orm": "<2.18",

            "symfony/doctrine-bridge": "<6.4"

        },

        "autoload": {

            "psr-4": {

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Merge release 2.8.0 into 3.0.x #566

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!

Merge release 2.8.0 into 3.0.x #566

Are you sure you want to change the base?

Uh oh!

Merge release 2.8.0 into 3.0.x #566

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!