Skip to content

Commit 6cc0137

Browse files
authored
Merge pull request #8 from Saeven/feature/php8-updates-and-more
Updates for latest PHP
2 parents 8299bf6 + 6d3c689 commit 6cc0137

File tree

4 files changed

+17
-17
lines changed

4 files changed

+17
-17
lines changed

composer.json

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,23 +15,24 @@
1515
"url": "https://github.com/Saeven/assetic-module.git"
1616
}
1717
],
18+
"minimum-stability": "dev",
1819
"require": {
1920
"php": "^8.0.0",
20-
"laminas/laminas-component-installer": "^2.4",
21-
"laminas/laminas-skeleton-installer": "^0.3",
21+
"ext-json": "*",
22+
"ext-intl": "*",
2223
"laminas/laminas-mvc": "^3.1.1",
23-
"laminas/laminas-form": "3.1.1",
24-
"laminas/laminas-view": "2.14.2",
25-
"laminas/laminas-servicemanager": "3.10.0",
24+
"laminas/laminas-form": "^3.1.1",
25+
"laminas/laminas-view": "^2.24.0",
26+
"laminas/laminas-servicemanager": "^3.10.0",
2627
"doctrine/annotations": "1.13.2",
2728
"doctrine/common": "3.2.x-dev",
2829
"doctrine/collections": "1.6.8",
29-
"doctrine/orm": "2.10.2",
30-
"doctrine/dbal": "2.13.6",
30+
"doctrine/orm": "2.13.1",
31+
"doctrine/dbal": "3.4.0",
3132
"doctrine/instantiator": "1.4.0",
3233
"doctrine/inflector": "2.1.x-dev",
33-
"doctrine/doctrine-orm-module": "4.1.0",
34-
"doctrine/doctrine-module": "4.2.2",
34+
"doctrine/doctrine-orm-module": "5.2.1",
35+
"doctrine/doctrine-module": "5.2.0",
3536
"doctrine/data-fixtures": "1.5.0",
3637
"beberlei/doctrineextensions": "v1.3.0",
3738
"ramsey/uuid": "4.1.1",
@@ -42,14 +43,12 @@
4243
"saeven/zf2-circlical-trans": "dev-master",
4344
"saeven/circlical-laminas-tailwind-forms": "dev-master",
4445
"saeven/zf2-form-builder": "dev-master",
45-
"kokspflanze/zfc-twig": "4.0.1",
46+
"kokspflanze/zfc-twig": "4.1.0",
4647
"twig/twig": "^3.0.1",
4748
"twig/string-extra": "@stable",
4849
"twig/intl-extra": "@stable",
49-
"fabiang/assetic-module": "3.0.2",
50-
"bjeavons/zxcvbn-php": "1.2.0",
51-
"ext-json": "*",
52-
"ext-intl": "*"
50+
"saeven/laminas-assetic": "*",
51+
"bjeavons/zxcvbn-php": "1.3.1"
5352
},
5453
"replace": {
5554
"laminas/laminas-cache-storage-adapter-apc": "*",
@@ -99,6 +98,7 @@
9998
"php -r 'if (file_exists(\"CHANGELOG.md\")) unlink(\"CHANGELOG.md\");'"
10099
],
101100
"serve": "php -S 0.0.0.0:8080 -t public",
101+
"myserve": "php -c /usr/local/etc/php/8.1/php.ini -S 0.0.0.0:8080 -t public",
102102
"test": "vendor/bin/phpunit",
103103
"static-analysis": "vendor/bin/psalm --shepherd --stats"
104104
},

config/modules.config.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
'Laminas\DeveloperTools',
2828
'SanSessionToolbar',
2929
'Application',
30-
'Fabiang\AsseticBundle',
30+
'Circlical\AsseticBundle',
3131
'CirclicalAutoWire',
3232
'CirclicalUser',
3333
];

module/Application/config/assetic.config.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
'combine' => true,
99

1010
'rendererToStrategy' => [
11-
\Laminas\View\Renderer\JsonRenderer::class => \Fabiang\AsseticBundle\View\NoneStrategy::class,
11+
\Laminas\View\Renderer\JsonRenderer::class => \Circlical\AsseticBundle\View\NoneStrategy::class,
1212
],
1313

1414
/*

module/Application/src/Factory/View/Helper/AssetHelperFactory.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace Application\Factory\View\Helper;
44

5-
use Fabiang\AsseticBundle\View\Helper\Asset;
5+
use Circlical\AsseticBundle\View\Helper\Asset;
66
use Interop\Container\ContainerInterface;
77
use Laminas\ServiceManager\Factory\FactoryInterface;
88

0 commit comments

Comments
 (0)