Skip to content

Migrating from Zend-Framework to Laminas #57

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 3, 2020
Merged

Migrating from Zend-Framework to Laminas #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
127 changes: 64 additions & 63 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,65 +1,66 @@
{
"name" : "mouf/mvc.splash-common",
"description" : "Splash is a PHP router. It takes an HTTP request and dispatches it to the appropriate controller.",
"type" : "mouf-library",
"authors" : [{
"name" : "David Négrier",
"email" : "d.negrier@thecodingmachine.com",
"homepage" : "http://mouf-php.com"
}
],
"keywords" : [
"mvc",
"framework",
"mouf",
"splash",
"splash-common"
],
"homepage" : "http://mouf-php.com/packages/mouf/mvc.splash-common",
"license" : [
"MIT"
],
"require" : {
"php" : ">=7.0",
"thecodingmachine/splash-router": "^10",
"mouf/mouf": "^2.0",
"mouf/html.htmlelement" : "^2.0",
"mouf/utils.action.common-action" : "~1.0",
"mouf/html.renderer.twig-extensions": "^1 || ^3",
"mouf/utils.common.conditioninterface": "~2.0",
"mouf/html.template.templateinterface": "^2.1 || ^3"
},
"require-dev": {
"phpunit/phpunit": "^5.0",
"satooshi/php-coveralls": "^1.0",
"mouf/picotainer": "~1.0",
"mnapoli/simplex": "^0.3",
"cache/array-adapter": "^0.4.0",
"phpstan/phpstan": "^0.10.1"
},
"autoload" : {
"psr-4" : {
"Mouf\\Mvc\\Splash\\" : "src/Mouf/Mvc/Splash"
}
},
"autoload-dev" : {
"psr-4" : {
"Mouf\\Mvc\\Splash\\" : "tests/Mouf/Mvc/Splash"
}
},
"scripts": {
"phpstan": "phpstan analyse src/Mouf -c phpstan.neon --level=0 --no-progress -vvv"
},
"minimum-stability": "dev",
"prefer-stable": true,
"extra" : {
"mouf" : {
"logo" : "doc/images/logo.png",
"section": {
"name": "MVC",
"description": "All the tools you need to route requests and display pages",
"weight": 10
}
}
}
"name": "mouf/mvc.splash-common",
"description": "Splash is a PHP router. It takes an HTTP request and dispatches it to the appropriate controller.",
"type": "mouf-library",
"authors": [
{
"name": "David Négrier",
"email": "d.negrier@thecodingmachine.com",
"homepage": "http://mouf-php.com"
}
],
"keywords": [
"mvc",
"framework",
"mouf",
"splash",
"splash-common"
],
"homepage": "http://mouf-php.com/packages/mouf/mvc.splash-common",
"license": [
"MIT"
],
"require": {
"php": ">=7.0",
"thecodingmachine/splash-router": "^10",
"mouf/mouf": "^2.0",
"mouf/html.htmlelement": "^2.0",
"mouf/utils.action.common-action": "~1.0",
"mouf/html.renderer.twig-extensions": "^1 || ^3",
"mouf/utils.common.conditioninterface": "~2.0",
"mouf/html.template.templateinterface": "^2.1 || ^3"
},
"require-dev": {
"phpunit/phpunit": "^5.0",
"satooshi/php-coveralls": "^1.0",
"mouf/picotainer": "~1.0",
"mnapoli/simplex": "^0.3",
"cache/array-adapter": "^0.4.0",
"phpstan/phpstan": "^0.10.1"
},
"autoload": {
"psr-4": {
"Mouf\\Mvc\\Splash\\": "src/Mouf/Mvc/Splash"
}
},
"autoload-dev": {
"psr-4": {
"Mouf\\Mvc\\Splash\\": "tests/Mouf/Mvc/Splash"
}
},
"scripts": {
"phpstan": "phpstan analyse src/Mouf -c phpstan.neon --level=0 --no-progress -vvv"
},
"minimum-stability": "dev",
"prefer-stable": true,
"extra": {
"mouf": {
"logo": "doc/images/logo.png",
"section": {
"name": "MVC",
"description": "All the tools you need to route requests and display pages",
"weight": 10
}
}
}
}
2 changes: 1 addition & 1 deletion src/Mouf/Mvc/Splash/Controllers/HttpErrorsController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
use TheCodingMachine\Splash\Controllers\Http400HandlerInterface;
use TheCodingMachine\Splash\Controllers\Http404HandlerInterface;
use TheCodingMachine\Splash\Controllers\Http500HandlerInterface;
use Zend\Diactoros\Response\JsonResponse;
use Laminas\Diactoros\Response\JsonResponse;

/**
* This class provides the default Splash behaviour when a HTTP 404 and HTTP 500 error is triggered.
Expand Down
4 changes: 2 additions & 2 deletions src/Mouf/Mvc/Splash/HtmlResponse.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

use Mouf\Html\HtmlElement\HtmlElementInterface;
use Psr\Http\Message\StreamInterface;
use Zend\Diactoros\Response;
use Zend\Diactoros\Stream;
use Laminas\Diactoros\Response;
use Laminas\Diactoros\Stream;

/**
* This class is a PSR-7 response that takes in parameter a HtmlElementInterface element and will render it.
Expand Down
4 changes: 2 additions & 2 deletions src/Mouf/Mvc/Splash/Services/SplashCreateControllerService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,14 +154,14 @@ public function generate(MoufManager $moufManager, $controllerName, $instanceNam
?>
<?php if ($importJsonResponse) {
?>
use Zend\Diactoros\Response\JsonResponse;
use Laminas\Diactoros\Response\JsonResponse;
<?php

}
?>
<?php if ($importRedirectResponse) {
?>
use Zend\Diactoros\Response\RedirectResponse;
use Laminas\Diactoros\Response\RedirectResponse;
<?php

}
Expand Down