Merge pull request #132 from OpenConext/feature/maintenance_nov-25

Add support for Symfony 7

Author: johanib

.github/workflows/test-integration.yml

@@ -6,16 +6,9 @@ jobs:
     continue-on-error: ${{ matrix.experimental }}
     strategy:
       matrix:
-        php-versions: [ '8.2']
+        php-versions: [ '8.2', '8.4']
         experimental: [false]
-        include:
-          - php-versions: '8.1'
-            experimental: true
-          - php-versions: '8.3'
-            experimental: true
-          - php-versions: '8.4'
-            experimental: true
-    timeout-minutes: 30
+    timeout-minutes: 15
     name: PHP ${{ matrix.php-versions }} on Ubuntu latest. Experimental == ${{ matrix.experimental }}
     steps:
       - name: Install PHP
@@ -29,7 +22,7 @@ jobs:
         continue-on-error: ${{ matrix.experimental }}
       - id: checks
         name: Run CI tests
-        run: composer check
+        run: composer check-ci
         continue-on-error: ${{ matrix.experimental }}
       - name: Output log files on failure
         if: failure()

.gitignore

@@ -3,3 +3,4 @@
 .idea
 composer.lock
 .phpunit.result.cache
+var

CHANGELOG.md

@@ -1,3 +1,10 @@
+# 7.0.0
+- Add SF 7 support
+- Upgrade dev & qa tooling
+
+Backward compatibility breaks:  
+ * Minor: `\Surfnet\SamlBundle\SAML2\BridgeContainer::debugMessage` Will now throw a `\Surfnet\SamlBundle\Exception\InvalidArgumentException` instead of 'Fatal error: Uncaught TypeError' if an invalid `$message` is debugged.
+
 # 6.0.0
 - Add SF 6 support
 - Require PHP 8.1

ci/qa/docheader

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+cd $(dirname $0)/../../
+
+./vendor/bin/docheader --no-ansi --docheader=ci/qa/docheader.template check src/
+

ci/qa/docheader.template

@@ -0,0 +1,16 @@
+/**
+ * Copyright %regexp:\d{4}% SURFnet %regexp:(B.V.|bv)%
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+

ci/qa/phpcbf

@@ -3,4 +3,4 @@
 cd $(dirname $0)/../../
 
 # https://github.com/squizlabs/PHP_CodeSniffer/wiki/Fixing-Errors-Automatically
-./vendor/bin/phpcbf --standard=ci/qa/phpcs.xml $1
+./vendor/bin/phpcbf --standard=ci/qa/phpcs.xml --extensions=php src $1

ci/qa/phpcpd

@@ -3,5 +3,4 @@
 cd $(dirname $0)/../../
 
 # https://github.com/sebastianbergmann/phpcpd
-./vendor/bin/phpcpd \
-    ./src $1
+vendor/bin/phpcpd ./src

ci/qa/phpcs

@@ -3,4 +3,4 @@
 cd $(dirname $0)/../../
 
 # https://github.com/squizlabs/PHP_CodeSniffer/wiki/Usage
-./vendor/bin/phpcs --report=full --standard=ci/qa/phpcs.xml --ignore=*/Tests/* --warning-severity=0 --extensions=php src
+./vendor/bin/phpcs --report=full --standard=ci/qa/phpcs.xml --warning-severity=0 --extensions=php src

ci/qa/phpcs.xml

@@ -15,5 +15,18 @@
             <property name="lineLimit" value="120"/>
             <property name="absoluteLineLimit" value="150"/>
         </properties>
+      <exclude-pattern>src/Tests/*</exclude-pattern>
     </rule>
+
+  <rule ref="PSR1.Methods.CamelCapsMethodName">
+    <exclude-pattern>src/Tests/*</exclude-pattern>
+  </rule>
+
+  <rule ref="SlevomatCodingStandard.Namespaces.ReferenceUsedNamesOnly"/>
+  <rule ref="SlevomatCodingStandard.Namespaces.UnusedUses">
+    <properties>
+      <property name="searchAnnotations" type="bool" value="true"/>
+    </properties>
+  </rule>
+  <rule ref="SlevomatCodingStandard.Namespaces.AlphabeticallySortedUses"/>
 </ruleset>

ci/qa/phplint.yaml

@@ -1,6 +1,6 @@
-path: [./src, ./tests]
+path: [./src]
 jobs: 10
-cache: /var/qa/phplint.cache
+cache-dir: var/qa/phplint.cache
 extensions:
     - php
 exclude: