Merge branch 'feature/php8.1' into develop
This commit is contained in:
commit
afc89b5cbd
5 changed files with 10 additions and 6 deletions
|
@ -5,10 +5,13 @@ workspace:
|
||||||
matrix:
|
matrix:
|
||||||
FLOW_VERSION:
|
FLOW_VERSION:
|
||||||
- 7.3
|
- 7.3
|
||||||
|
PHP_VERSION:
|
||||||
|
- 7.4
|
||||||
|
- 8.1
|
||||||
|
|
||||||
pipeline:
|
pipeline:
|
||||||
functional-tests:
|
functional-tests:
|
||||||
image: thecodingmachine/php:7.4-v4-cli
|
image: "thecodingmachine/php:${PHP_VERSION}-v4-cli"
|
||||||
environment:
|
environment:
|
||||||
# Enable the PDO_SQLITE extension
|
# Enable the PDO_SQLITE extension
|
||||||
- "PHP_EXTENSION_PDO_SQLITE=1"
|
- "PHP_EXTENSION_PDO_SQLITE=1"
|
||||||
|
|
|
@ -8,6 +8,7 @@ namespace DigiComp\FlowSessionLock\Annotations;
|
||||||
* @Annotation
|
* @Annotation
|
||||||
* @Target({"METHOD"})
|
* @Target({"METHOD"})
|
||||||
*/
|
*/
|
||||||
final class ReadOnly
|
#[\Attribute(\Attribute::TARGET_METHOD)]
|
||||||
|
final class Unlock
|
||||||
{
|
{
|
||||||
}
|
}
|
|
@ -36,7 +36,7 @@ class ReadOnlyAspect
|
||||||
protected bool $readOnly = false;
|
protected bool $readOnly = false;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @Flow\Around("methodAnnotatedWith(DigiComp\FlowSessionLock\Annotations\ReadOnly) || filter(DigiComp\FlowSessionLock\Aspects\ReadOnlyFilter)")
|
* @Flow\Around("methodAnnotatedWith(DigiComp\FlowSessionLock\Annotations\Unlock) || filter(DigiComp\FlowSessionLock\Aspects\ReadOnlyFilter)")
|
||||||
* @param JoinPointInterface $joinPoint
|
* @param JoinPointInterface $joinPoint
|
||||||
* @return mixed
|
* @return mixed
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -22,7 +22,7 @@ class ExampleController extends ActionController
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @Flow\Session(autoStart=true);
|
* @Flow\Session(autoStart=true);
|
||||||
* @FlowSessionLock\ReadOnly
|
* @FlowSessionLock\Unlock
|
||||||
* @return string
|
* @return string
|
||||||
*/
|
*/
|
||||||
public function unprotectedByAnnotationAction()
|
public function unprotectedByAnnotationAction()
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
"type": "neos-package",
|
"type": "neos-package",
|
||||||
"require": {
|
"require": {
|
||||||
"neos/flow": "^7.3.0",
|
"neos/flow": "^7.3.0",
|
||||||
"php": ">=7.4",
|
"php": "^7.4 | ^8.1",
|
||||||
"symfony/lock": "^5.2.0"
|
"symfony/lock": "^5.2.0"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
|
@ -20,7 +20,7 @@
|
||||||
"package-key": "DigiComp.FlowSessionLock"
|
"package-key": "DigiComp.FlowSessionLock"
|
||||||
},
|
},
|
||||||
"branch-alias": {
|
"branch-alias": {
|
||||||
"dev-develop": "3.0.x-dev",
|
"dev-develop": "4.0.x-dev",
|
||||||
"dev-version/2.x-dev": "2.1.x-dev"
|
"dev-version/2.x-dev": "2.1.x-dev"
|
||||||
},
|
},
|
||||||
"applied-flow-migrations": [
|
"applied-flow-migrations": [
|
||||||
|
|
Loading…
Reference in a new issue