Merge pull request #146 from Slamdunk/conflicts

Explicit composer.json conflicts for unsupported deps
laminas · Jun 7, 2021 · ed6c972 · ed6c972
2 parents 29c691f + 60c81b8
commit ed6c972
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 15 deletions.
diff --git a/composer.json b/composer.json
@@ -15,13 +15,18 @@
     },
     "conflict": {
         "doctrine/annotations": "<1.12.0",
-        "laminas/laminas-servicemanager": "<3.6.0"
+        "laminas/laminas-captcha": "<2.10.0",
+        "laminas/laminas-eventmanager": "<3.3.0",
+        "laminas/laminas-i18n": "<2.11.0",
+        "laminas/laminas-recaptcha": "<3.3.0",
+        "laminas/laminas-servicemanager": "<3.6.0",
+        "laminas/laminas-view": "<2.12.0"
     },
     "require-dev": {
         "ext-intl": "*",
         "doctrine/annotations": "^1.12.0",
         "laminas/laminas-captcha": "^2.10.0",
-        "laminas/laminas-coding-standard": "^2.2.1",
+        "laminas/laminas-coding-standard": "^2.3.0",
         "laminas/laminas-escaper": "^2.7.0",
         "laminas/laminas-eventmanager": "^3.3.1",
         "laminas/laminas-filter": "^2.11.0",
@@ -34,8 +39,8 @@
         "laminas/laminas-validator": "^2.14.4",
         "laminas/laminas-view": "^2.12.0",
         "phpspec/prophecy-phpunit": "^2.0.1",
-        "phpunit/phpunit": "^9.5.4",
-        "psalm/plugin-phpunit": "^0.15.1",
+        "phpunit/phpunit": "^9.5.5",
+        "psalm/plugin-phpunit": "^0.16.0",
         "vimeo/psalm": "^4.7.3"
     },
     "suggest": {

diff --git a/phpcs.xml b/phpcs.xml
@@ -17,7 +17,4 @@
 
     <!-- Include all rules from the Laminas Coding Standard -->
     <rule ref="LaminasCodingStandard"/>
-    <rule ref="SlevomatCodingStandard.Namespaces.UnusedUses">
-        <exclude-pattern>src\/Annotation\/</exclude-pattern>
-    </rule>
 </ruleset>
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -134,9 +134,6 @@
       <code>$elements</code>
       <code>$fieldsets</code>
     </PossibleRawObjectIteration>
-    <TooManyArguments occurrences="1">
-      <code>setValidationGroup</code>
-    </TooManyArguments>
   </file>
   <file src="src/Fieldset.php">
     <DocblockTypeContradiction occurrences="2">

diff --git a/src/Annotation/Instance.php b/src/Annotation/Instance.php
@@ -8,11 +8,6 @@
 use Doctrine\Common\Annotations\Annotation;
 use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor;
 
-use function sprintf;
-use function trigger_error;
-
-use const E_USER_DEPRECATED;
-
 /**
  * Instance (formerly "object") annotation
  *