rework

Author: johanib

ci/qa/phpcpd

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+cd $(dirname $0)/../../
+
+# https://github.com/sebastianbergmann/phpcpd
+vendor/bin/phpcpd ./src

ci/qa/phpunit.xml

@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/9.6/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/11.5/phpunit.xsd"
          backupGlobals="false"
          colors="true"
          bootstrap="../../vendor/autoload.php"
+         cacheDirectory="../../var/qa/phpunit.cache"
 >
     <php>
         <env name="SYMFONY_DEPRECATIONS_HELPER" value="weak" />
@@ -18,16 +19,4 @@
             <directory>../../src/Tests/Component</directory>
         </testsuite>
     </testsuites>
-    <coverage processUncoveredFiles="true">
-        <include>
-            <directory>../../src</directory>
-        </include>
-        <exclude>
-            <directory>../../src/Tests</directory>
-        </exclude>
-    </coverage>
-    <listeners>
-        <listener class="\Symfony\Bridge\PhpUnit\SymfonyTestsListener"/>
-        <listener class="\Mockery\Adapter\Phpunit\TestListener"/>
-    </listeners>
 </phpunit>

composer.json

@@ -21,6 +21,7 @@
     "require-dev": {
         "ext-libxml": "*",
         "ext-zlib": "*",
+        "irstea/phpcpd-shim": "^6.0",
         "malukenho/docheader": "^1.1",
         "mockery/mockery": "^1.5",
         "overtrue/phplint": "*",
@@ -43,6 +44,7 @@
           "@composer-validate",
           "@license-headers",
           "@phplint",
+          "@phpcpd",
           "@phpcs",
           "@phpmd",
           "@test",

src/SAML2/Attribute/ConfigurableAttributeSetFactory.php

@@ -31,7 +31,7 @@ public static function configureWhichAttributeSetToCreate(mixed $attributeSetCla
             throw InvalidArgumentException::invalidType('non-empty string', 'attributeSetClassName', $attributeSetClassName);
         }
 
-        if (!is_a($attributeSetClassName, '\Surfnet\SamlBundle\SAML2\Attribute\AttributeSetFactory', true)) {
+        if (!is_a($attributeSetClassName, AttributeSetFactory::class, true)) {
             throw new InvalidArgumentException(sprintf(
                 'Cannot use class "%s": it must implement "%s"',
                 $attributeSetClassName,

src/Tests/Component/Metadata/XsdValidator.php

@@ -22,13 +22,6 @@
 
 class XsdValidator
 {
-    /**
-     * Validate an XML document against an XSD schema
-     *
-     * @param DOMDocument $document The XML document to validate
-     * @param string $xsdPath Path to the XSD schema file
-     * @return array Empty array if valid, array of error messages if invalid
-     */
     public function validate(DOMDocument $document, string $xsdPath): array
     {
         if (!file_exists($xsdPath)) {
@@ -56,13 +49,6 @@ public function validate(DOMDocument $document, string $xsdPath): array
         return [];
     }
 
-    /**
-     * Check if an XML document is valid against an XSD schema
-     *
-     * @param DOMDocument $document The XML document to validate
-     * @param string $xsdPath Path to the XSD schema file
-     * @return bool True if valid, false otherwise
-     */
     public function isValid(DOMDocument $document, string $xsdPath): bool
     {
         return empty($this->validate($document, $xsdPath));