Skip to content

Commit

Permalink
Migrating from Zend-Framework to Laminas
Browse files Browse the repository at this point in the history
This commit was generated using laminas-migrate
  • Loading branch information
moufmouf committed Sep 3, 2020
1 parent 43c0fc3 commit 7b38421
Show file tree
Hide file tree
Showing 4 changed files with 69 additions and 68 deletions.
127 changes: 64 additions & 63 deletions composer.json
@@ -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
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
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
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

0 comments on commit 7b38421

Please sign in to comment.