Skip to content

Commit ce36e2a

Browse files
Fix current yii CI issues (#589)
CI currently fails because some unexpected changes and conflicts, this fixes a few issues. This only fixes partially #586. We did not yet update the whole yii/app to use current state of https://github.com/yiisoft/app.
1 parent 9498d1f commit ce36e2a

File tree

25 files changed

+2193
-1754
lines changed

25 files changed

+2193
-1754
lines changed

.examples/laravel/composer.lock

Lines changed: 202 additions & 147 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.examples/mezzio/composer.lock

Lines changed: 145 additions & 112 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.examples/spiral/composer.lock

Lines changed: 187 additions & 136 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.examples/symfony/composer.lock

Lines changed: 248 additions & 173 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.examples/yii/composer.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@
7878
"yiisoft/i18n": "^1.1",
7979
"yiisoft/log": "^2.1",
8080
"yiisoft/log-target-file": "^3.0",
81-
"yiisoft/router": "^3.0",
82-
"yiisoft/router-fastroute": "^3.0",
81+
"yiisoft/router": "^4.0",
82+
"yiisoft/router-fastroute": "^4.0",
8383
"yiisoft/translator": "^3.0",
8484
"yiisoft/translator-message-php": "^1.1",
8585
"yiisoft/view": "^12.0",
@@ -119,7 +119,6 @@
119119
"symfony/css-selector": "^6.2 || ^7.1",
120120
"symfony/dom-crawler": "^6.2 || ^7.1",
121121
"yiisoft/yii-debug-api": "^3.0@dev",
122-
"yiisoft/yii-debug-viewer": "^3.0@dev",
123122
"yiisoft/yii-testing": "dev-master"
124123
},
125124
"conflict": {

.examples/yii/composer.lock

Lines changed: 323 additions & 348 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.examples/yii/config/common/di/router.php

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,20 @@
33
declare(strict_types=1);
44

55
use Yiisoft\Config\Config;
6-
use Yiisoft\Csrf\CsrfMiddleware;
7-
use Yiisoft\DataResponse\Middleware\FormatDataResponse;
8-
use Yiisoft\Router\Group;
6+
use Yiisoft\Definitions\DynamicReference;
97
use Yiisoft\Router\RouteCollection;
108
use Yiisoft\Router\RouteCollectionInterface;
11-
use Yiisoft\Router\RouteCollectorInterface;
9+
use Yiisoft\Router\RouteCollector;
1210

1311
/** @var Config $config */
1412

1513
return [
16-
RouteCollectionInterface::class => static function (RouteCollectorInterface $collector) use ($config) {
17-
$collector
18-
->middleware(CsrfMiddleware::class)
19-
->middleware(FormatDataResponse::class)
20-
->addGroup(
21-
Group::create()
22-
->routes(...$config->get('routes')),
23-
);
24-
25-
return new RouteCollection($collector);
26-
},
14+
RouteCollectionInterface::class => [
15+
'class' => RouteCollection::class,
16+
'__construct()' => [
17+
'collector' => DynamicReference::to(
18+
static fn () => (new RouteCollector())->addRoute(...$config->get('routes')),
19+
),
20+
],
21+
],
2722
];

0 commit comments

Comments
 (0)
SYSTEM_READY >> ...MS