Merge branch 'master'

Conflicts: .github/workflows/ci.yml composer.json config/phpcs.xml phpcs.xml src/Propel/Generator/Behavior/AggregateMultipleColumns/AggregateMultipleColumnsBehavior.php src/Propel/Generator/Model/Diff/ColumnComparator.php src/Propel/Generator/Model/MappingModel.php src/Propel/Generator/Model/PhpNameGenerator.php
michbeck · Dec 6, 2021 · d110752 · d110752
2 parents 88f1834 + c15e360
commit d110752
Show file tree

Hide file tree

Showing 162 changed files with 1,547 additions and 902 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -5,8 +5,6 @@ on:
     branches:
       - 'master'
   pull_request:
-  schedule:
-    - cron: "0 0 * * *"
   workflow_dispatch:
 
 jobs:
@@ -16,22 +14,22 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                php-version: [ '8.0', '8.1' ]
+                php-version: [ '7.4', '8.0', '8.1' ]
                 db-type: [ sqlite, mysql, pgsql, agnostic ]
-                symfony-version: [ '3-min', '3-max', '4-min', '4-max', '5-min', '5-max' ]
+                symfony-version: [ '4-min', '4-max', '5-min', '5-max' ]
                 exclude:
                   - symfony-version: '4-min'
         steps:
             - name: Install PostgreSQL latest
-              if: matrix.db-type == 'pgsql' && matrix.php-version != '7.2'
+              if: matrix.db-type == 'pgsql' && matrix.php-version != '7.3'
               uses: CasperWA/postgresql-action@v1.2
               with:
                   postgresql db: 'propel-tests'
                   postgresql user: 'postgres'
                   postgresql password: 'postgres'
 
             - name: Install PostgreSQL min
-              if: matrix.db-type == 'pgsql' && matrix.php-version == '7.2'
+              if: matrix.db-type == 'pgsql' && matrix.php-version == '7.3'
               uses: CasperWA/postgresql-action@v1.2
               with:
                   postgresql version: 9
@@ -40,11 +38,11 @@ jobs:
                   postgresql password: 'postgres'
 
             - name: Install MariaDb latest
-              if: matrix.db-type == 'mysql' && matrix.php-version != '7.2'
+              if: matrix.db-type == 'mysql' && matrix.php-version != '7.3'
               uses: getong/mariadb-action@v1.1
 
             - name: Install MariaDb min
-              if: matrix.db-type == 'mysql' && matrix.php-version == '7.2'
+              if: matrix.db-type == 'mysql' && matrix.php-version == '7.3'
               uses: getong/mariadb-action@v1.1
               with:
                   mariadb version: '10.2'
@@ -151,11 +149,11 @@ jobs:
             - name: Composer install
               run: composer install --prefer-dist --no-interaction
 
-            - name: Code Style
-              run: composer cs-check
-
             - name: PHPStan
               run: composer stan
 
             - name: Psalm
               run: composer psalm
+
+            - name: Code Style
+              run: composer cs-check
diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@ Propel2 is an open-source Object-Relational Mapping (ORM) for PHP.
 [![Github actions Status](https://github.com/propelorm/Propel2/workflows/CI/badge.svg?branch=master)](https://github.com/propelorm/Propel2/actions?query=workflow%3ACI+branch%3Amaster)
 [![codecov](https://codecov.io/gh/propelorm/Propel2/branch/master/graph/badge.svg?token=L1thFB9nOG)](https://codecov.io/gh/propelorm/Propel2)
 [![Code Climate](https://codeclimate.com/github/propelorm/Propel2/badges/gpa.svg)](https://codeclimate.com/github/propelorm/Propel2)
-[![Minimum PHP Version](http://img.shields.io/badge/php-%3E%3D%207.2-8892BF.svg)](https://php.net/)
+[![Minimum PHP Version](http://img.shields.io/badge/php-%3E%3D%207.3-8892BF.svg)](https://php.net/)
 [![License](https://poser.pugx.org/propel/propel/license.svg)](https://packagist.org/packages/propel/propel)
 [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/propelorm/Propel)
 

diff --git a/composer.json b/composer.json
@@ -16,7 +16,7 @@
         }
     ],
     "require": {
-        "php": ">=8.0",
+        "php": ">=7.4",
         "psr/log": "^1.0||^2.0||^3.0",
         "symfony/yaml": "^3.4.0||^4.0.0||^5.0.0",
         "symfony/config": "^3.4.0||^4.0.0||^5.0.0",
@@ -32,8 +32,8 @@
         "ext-json": "*",
         "monolog/monolog": "^1.3",
         "phpstan/phpstan": "^1.2",
-        "phpunit/phpunit": "^8.0.0||^9.0.0",
-        "spryker/code-sniffer": "^0.15.6",
+        "phpunit/phpunit": "^9.5.0",
+        "spryker/code-sniffer": "^0.17.2",
         "psalm/phar": "^4.14",
         "mikey179/vfsstream": "^1.6"
     },
@@ -49,8 +49,8 @@
         "bin/propel"
     ],
     "scripts": {
-        "cs-check": "phpcs -p -s --standard=config/phpcs.xml src/",
-        "cs-fix": "phpcbf -p --standard=config/phpcs.xml src/",
+        "cs-check": "phpcs",
+        "cs-fix": "phpcbf",
         "stan": "vendor/bin/phpstan analyze",
         "stan-baseline": "vendor/bin/phpstan analyze --generate-baseline",
         "psalm": "vendor/bin/psalm.phar --show-info=false",

diff --git a/config/phpcs.xml → phpcs.xml b/config/phpcs.xml → phpcs.xml
@@ -6,18 +6,24 @@
         Extends Spryker+Slevomatik Coding Standard.
     </description>
 
-    <rule ref="vendor/spryker/code-sniffer/Spryker/ruleset.xml"/>
+    <config name="installed_paths" value="../../spryker/code-sniffer"/>
+
+    <arg value="nps"/>
+
+    <file>src/</file>
 
     <exclude-pattern>*/templates/*</exclude-pattern>
 
+    <rule ref="Spryker"/>
+
     <!-- exclude for now -->
     <rule ref="Spryker.ControlStructures.NoInlineAssignment">
         <severity>0</severity>
     </rule>
-    <rule ref="SlevomatCodingStandard.ControlStructures.DisallowYodaComparison">
+    <rule ref="SlevomatCodingStandard.ControlStructures.AssignmentInCondition.AssignmentInCondition">
         <severity>0</severity>
     </rule>
-    <rule ref="SlevomatCodingStandard.Classes.UnusedPrivateElements">
+    <rule ref="SlevomatCodingStandard.ControlStructures.DisallowYodaComparison">
         <severity>0</severity>
     </rule>
     <rule ref="Generic.PHP.NoSilencedErrors">