Skip to content

Commit

Permalink
Merge pull request #180 from laminas/doctrine-annotation-deprecations
Browse files Browse the repository at this point in the history
Fixes Test Failures relating to InputFilter Regression and Doctrine Annotations Changes
  • Loading branch information
Ocramius authored Jul 25, 2022
2 parents c1a8474 + 6766141 commit 1208afe
Show file tree
Hide file tree
Showing 16 changed files with 248 additions and 138 deletions.
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"require": {
"php": "^7.4 || ~8.0.0 || ~8.1.0",
"laminas/laminas-hydrator": "^4.3.1",
"laminas/laminas-inputfilter": "^2.13.0",
"laminas/laminas-inputfilter": "^2.19.1",
"laminas/laminas-stdlib": "^3.7.1"
},
"conflict": {
Expand All @@ -24,7 +24,7 @@
},
"require-dev": {
"ext-intl": "*",
"doctrine/annotations": "^1.13.2",
"doctrine/annotations": "^1.13.3",
"laminas/laminas-captcha": "^2.11.0",
"laminas/laminas-coding-standard": "^2.3.0",
"laminas/laminas-db": "^2.13.4",
Expand All @@ -34,7 +34,7 @@
"laminas/laminas-i18n": "^2.14.0",
"laminas/laminas-modulemanager": "^2.11.0",
"laminas/laminas-recaptcha": "^3.4.0",
"laminas/laminas-servicemanager": "^3.10.0",
"laminas/laminas-servicemanager": "^3.15.1",
"laminas/laminas-session": "^2.12.1",
"laminas/laminas-text": "^2.9.0",
"laminas/laminas-validator": "^2.16.0",
Expand Down
104 changes: 36 additions & 68 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions phpcs.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
<arg name="parallel" value="80"/>

<!-- Show progress -->
<arg value="p"/>
<arg value="ps"/>

<!-- Paths to check -->
<file>src</file>
<file>test</file>

<!-- Include all rules from the Laminas Coding Standard -->
<rule ref="LaminasCodingStandard"/>
</ruleset>
</ruleset>
Loading

0 comments on commit 1208afe

Please sign in to comment.