Skip to content

Commit 7b38421

Browse files
committed
Migrating from Zend-Framework to Laminas
This commit was generated using laminas-migrate
1 parent 43c0fc3 commit 7b38421

File tree

4 files changed

+69
-68
lines changed

4 files changed

+69
-68
lines changed

composer.json

Lines changed: 64 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -1,65 +1,66 @@
11
{
2-
"name" : "mouf/mvc.splash-common",
3-
"description" : "Splash is a PHP router. It takes an HTTP request and dispatches it to the appropriate controller.",
4-
"type" : "mouf-library",
5-
"authors" : [{
6-
"name" : "David Négrier",
7-
"email" : "d.negrier@thecodingmachine.com",
8-
"homepage" : "http://mouf-php.com"
9-
}
10-
],
11-
"keywords" : [
12-
"mvc",
13-
"framework",
14-
"mouf",
15-
"splash",
16-
"splash-common"
17-
],
18-
"homepage" : "http://mouf-php.com/packages/mouf/mvc.splash-common",
19-
"license" : [
20-
"MIT"
21-
],
22-
"require" : {
23-
"php" : ">=7.0",
24-
"thecodingmachine/splash-router": "^10",
25-
"mouf/mouf": "^2.0",
26-
"mouf/html.htmlelement" : "^2.0",
27-
"mouf/utils.action.common-action" : "~1.0",
28-
"mouf/html.renderer.twig-extensions": "^1 || ^3",
29-
"mouf/utils.common.conditioninterface": "~2.0",
30-
"mouf/html.template.templateinterface": "^2.1 || ^3"
31-
},
32-
"require-dev": {
33-
"phpunit/phpunit": "^5.0",
34-
"satooshi/php-coveralls": "^1.0",
35-
"mouf/picotainer": "~1.0",
36-
"mnapoli/simplex": "^0.3",
37-
"cache/array-adapter": "^0.4.0",
38-
"phpstan/phpstan": "^0.10.1"
39-
},
40-
"autoload" : {
41-
"psr-4" : {
42-
"Mouf\\Mvc\\Splash\\" : "src/Mouf/Mvc/Splash"
43-
}
44-
},
45-
"autoload-dev" : {
46-
"psr-4" : {
47-
"Mouf\\Mvc\\Splash\\" : "tests/Mouf/Mvc/Splash"
48-
}
49-
},
50-
"scripts": {
51-
"phpstan": "phpstan analyse src/Mouf -c phpstan.neon --level=0 --no-progress -vvv"
52-
},
53-
"minimum-stability": "dev",
54-
"prefer-stable": true,
55-
"extra" : {
56-
"mouf" : {
57-
"logo" : "doc/images/logo.png",
58-
"section": {
59-
"name": "MVC",
60-
"description": "All the tools you need to route requests and display pages",
61-
"weight": 10
62-
}
63-
}
64-
}
2+
"name": "mouf/mvc.splash-common",
3+
"description": "Splash is a PHP router. It takes an HTTP request and dispatches it to the appropriate controller.",
4+
"type": "mouf-library",
5+
"authors": [
6+
{
7+
"name": "David Négrier",
8+
"email": "d.negrier@thecodingmachine.com",
9+
"homepage": "http://mouf-php.com"
10+
}
11+
],
12+
"keywords": [
13+
"mvc",
14+
"framework",
15+
"mouf",
16+
"splash",
17+
"splash-common"
18+
],
19+
"homepage": "http://mouf-php.com/packages/mouf/mvc.splash-common",
20+
"license": [
21+
"MIT"
22+
],
23+
"require": {
24+
"php": ">=7.0",
25+
"thecodingmachine/splash-router": "^10",
26+
"mouf/mouf": "^2.0",
27+
"mouf/html.htmlelement": "^2.0",
28+
"mouf/utils.action.common-action": "~1.0",
29+
"mouf/html.renderer.twig-extensions": "^1 || ^3",
30+
"mouf/utils.common.conditioninterface": "~2.0",
31+
"mouf/html.template.templateinterface": "^2.1 || ^3"
32+
},
33+
"require-dev": {
34+
"phpunit/phpunit": "^5.0",
35+
"satooshi/php-coveralls": "^1.0",
36+
"mouf/picotainer": "~1.0",
37+
"mnapoli/simplex": "^0.3",
38+
"cache/array-adapter": "^0.4.0",
39+
"phpstan/phpstan": "^0.10.1"
40+
},
41+
"autoload": {
42+
"psr-4": {
43+
"Mouf\\Mvc\\Splash\\": "src/Mouf/Mvc/Splash"
44+
}
45+
},
46+
"autoload-dev": {
47+
"psr-4": {
48+
"Mouf\\Mvc\\Splash\\": "tests/Mouf/Mvc/Splash"
49+
}
50+
},
51+
"scripts": {
52+
"phpstan": "phpstan analyse src/Mouf -c phpstan.neon --level=0 --no-progress -vvv"
53+
},
54+
"minimum-stability": "dev",
55+
"prefer-stable": true,
56+
"extra": {
57+
"mouf": {
58+
"logo": "doc/images/logo.png",
59+
"section": {
60+
"name": "MVC",
61+
"description": "All the tools you need to route requests and display pages",
62+
"weight": 10
63+
}
64+
}
65+
}
6566
}

src/Mouf/Mvc/Splash/Controllers/HttpErrorsController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
use TheCodingMachine\Splash\Controllers\Http400HandlerInterface;
1414
use TheCodingMachine\Splash\Controllers\Http404HandlerInterface;
1515
use TheCodingMachine\Splash\Controllers\Http500HandlerInterface;
16-
use Zend\Diactoros\Response\JsonResponse;
16+
use Laminas\Diactoros\Response\JsonResponse;
1717

1818
/**
1919
* This class provides the default Splash behaviour when a HTTP 404 and HTTP 500 error is triggered.

src/Mouf/Mvc/Splash/HtmlResponse.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
use Mouf\Html\HtmlElement\HtmlElementInterface;
66
use Psr\Http\Message\StreamInterface;
7-
use Zend\Diactoros\Response;
8-
use Zend\Diactoros\Stream;
7+
use Laminas\Diactoros\Response;
8+
use Laminas\Diactoros\Stream;
99

1010
/**
1111
* This class is a PSR-7 response that takes in parameter a HtmlElementInterface element and will render it.

src/Mouf/Mvc/Splash/Services/SplashCreateControllerService.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,14 +154,14 @@ public function generate(MoufManager $moufManager, $controllerName, $instanceNam
154154
?>
155155
<?php if ($importJsonResponse) {
156156
?>
157-
use Zend\Diactoros\Response\JsonResponse;
157+
use Laminas\Diactoros\Response\JsonResponse;
158158
<?php
159159

160160
}
161161
?>
162162
<?php if ($importRedirectResponse) {
163163
?>
164-
use Zend\Diactoros\Response\RedirectResponse;
164+
use Laminas\Diactoros\Response\RedirectResponse;
165165
<?php
166166

167167
}

0 commit comments

Comments
 (0)