Skip to content

Commit

Permalink
Merge branch '3.6.x' of github.com:laminas/laminas-form into remove-c…
Browse files Browse the repository at this point in the history
…ontainer-interop
  • Loading branch information
Gary Lockett committed Oct 29, 2022
2 parents 8dd4c62 + d0ff15a commit c00df4f
Show file tree
Hide file tree
Showing 124 changed files with 1,225 additions and 1,715 deletions.
2 changes: 0 additions & 2 deletions .coveralls.yml

This file was deleted.

6 changes: 4 additions & 2 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
/.coveralls.yml export-ignore
/.gitattributes export-ignore
/.github/ export-ignore
/.gitignore export-ignore
Expand All @@ -7,6 +6,9 @@
/mkdocs.yml export-ignore
/phpcs.xml export-ignore
/phpunit.xml.dist export-ignore
/psalm.xml.dist export-ignore
/psalm.xml export-ignore
/psalm-baseline.xml export-ignore
/test/ export-ignore
/.psr-container.php.stub export-ignore
/renovate.json export-ignore
/composer.lock export-ignore
5 changes: 5 additions & 0 deletions .laminas-ci.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"ignore_php_platform_requirements": {
"8.2": true
}
}
24 changes: 24 additions & 0 deletions .psr-container.php.stub
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<?php

declare(strict_types=1);

namespace Psr\Container {
/**
* Provides automatic type inference for Psalm when retrieving a service from a container using a FQCN
*/
interface ContainerInterface
{
/**
* @param string|class-string $id
* @return bool
*/
public function has(string $id);

/**
* @template T
* @psalm-param string|class-string<T> $id
* @psalm-return ($id is class-string ? T : mixed)
*/
public function get(string $id);
}
}
43 changes: 21 additions & 22 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,41 +8,40 @@
"homepage": "https://laminas.dev",
"license": "BSD-3-Clause",
"require": {
"php": "^7.4 || ~8.0.0 || ~8.1.0",
"php": "~8.0.0 || ~8.1.0 || ~8.2.0",
"laminas/laminas-hydrator": "^4.3.1",
"laminas/laminas-inputfilter": "^2.19.1",
"laminas/laminas-stdlib": "^3.7.1"
},
"conflict": {
"doctrine/annotations": "<1.12.0",
"laminas/laminas-captcha": "<2.11.0",
"laminas/laminas-eventmanager": "<3.4.0",
"laminas/laminas-i18n": "<2.12.0",
"laminas/laminas-captcha": "<2.13.0",
"laminas/laminas-eventmanager": "<3.6.0",
"laminas/laminas-i18n": "<2.19.0",
"laminas/laminas-recaptcha": "<3.4.0",
"laminas/laminas-servicemanager": "<3.10.0",
"laminas/laminas-view": "<2.14.0"
"laminas/laminas-servicemanager": "<3.19.0",
"laminas/laminas-view": "<2.24.0"
},
"require-dev": {
"ext-intl": "*",
"doctrine/annotations": "^1.13.3",
"laminas/laminas-captcha": "^2.11.0",
"laminas/laminas-coding-standard": "^2.3.0",
"laminas/laminas-db": "^2.13.4",
"laminas/laminas-escaper": "^2.9.0",
"laminas/laminas-eventmanager": "^3.4.0",
"laminas/laminas-filter": "^2.14.0",
"laminas/laminas-i18n": "^2.14.0",
"laminas/laminas-modulemanager": "^2.11.0",
"laminas/laminas-captcha": "^2.13",
"laminas/laminas-coding-standard": "^2.4",
"laminas/laminas-db": "^2.15",
"laminas/laminas-escaper": "^2.12",
"laminas/laminas-eventmanager": "^3.6",
"laminas/laminas-filter": "^2.23",
"laminas/laminas-i18n": "^2.19",
"laminas/laminas-modulemanager": "^2.12",
"laminas/laminas-recaptcha": "^3.4.0",
"laminas/laminas-servicemanager": "^3.15.1",
"laminas/laminas-session": "^2.12.1",
"laminas/laminas-servicemanager": "^3.19",
"laminas/laminas-session": "^2.13",
"laminas/laminas-text": "^2.9.0",
"laminas/laminas-validator": "^2.16.0",
"laminas/laminas-view": "^2.19.1",
"phpspec/prophecy-phpunit": "^2.0.1",
"phpunit/phpunit": "^9.5.14",
"laminas/laminas-validator": "^2.26",
"laminas/laminas-view": "^2.24",
"phpunit/phpunit": "^9.5.25",
"psalm/plugin-phpunit": "^0.17.0",
"vimeo/psalm": "^4.21.0"
"vimeo/psalm": "^4.29"
},
"suggest": {
"doctrine/annotations": "^1.12, required to use laminas-form annotations support",
Expand All @@ -60,7 +59,7 @@
"dealerdirect/phpcodesniffer-composer-installer": true
},
"platform": {
"php": "7.4.99"
"php": "8.0.99"
}
},
"extra": {
Expand Down
Loading

0 comments on commit c00df4f

Please sign in to comment.