Skip to content

Commit 9b68fd6

Browse files
author
costin
committed
Replace Zend namespace with Laminas and Mezzio namespaces
1 parent 6fd0967 commit 9b68fd6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+246
-228
lines changed

‎CHANGELOG.md‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
## 2.0.0 - 2020-01-31
2+
3+
### Changed
4+
* Replaced Zend namespace with Laminas and Mezzio namespaces.
5+
6+
### Added
7+
* Added Laminas dependencies
8+
9+
### Deprecated
10+
* Nothing
11+
12+
### Removed
13+
* Removed Zend packages dependencies
14+
15+
### Fixed
16+
* Nothing
17+
18+
119
## 1.0.1 - 2018-06-12
220

321
User listing bug fix

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ $ composer create-project dotkernel/admin .
1616
The setup script will prompt for some custom settings. When encountering a question like the one below:
1717

1818
```shell
19-
Please select which config file you wish to inject 'Zend\Session\ConfigProvider' into:
19+
Please select which config file you wish to inject 'Laminas\Session\ConfigProvider' into:
2020
[0] Do not inject
2121
[1] config/config.php
2222
Make your selection (default is 0):

‎bin/clear-config-cache.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
*
55
* Can also be invoked as `composer clear-config-cache`.
66
*
7-
* @see https://github.com/zendframework/zend-expressive-skeleton for the canonical source repository
7+
* @see https://github.com/mezzio/mezzio-skeleton for the canonical source repository
88
* @copyright Copyright (c) 2017 Zend Technologies USA Inc. (http://www.zend.com)
9-
* @license https://github.com/zendframework/zend-expressive-skeleton/blob/master/LICENSE.md New BSD License
9+
* @license https://github.com/mezzio/mezzio-skeleton/blob/master/LICENSE.md New BSD License
1010
*/
1111

1212
chdir(__DIR__ . '/../');

‎composer.json‎

Lines changed: 106 additions & 106 deletions
Original file line numberDiff line numberDiff line change
@@ -1,110 +1,110 @@
11
{
2-
"name": "dotkernel/admin",
3-
"description": "Dotkernel Admin Application",
4-
"type": "project",
5-
"license": "MIT",
6-
"authors": [
7-
{
8-
"name": "DotKernel Team",
9-
"email": "team@dotkernel.com"
10-
}
11-
],
12-
"config": {
13-
"sort-packages": true
14-
},
15-
"require": {
16-
"php": "^7.1",
17-
"dotkernel/dot-annotated-services": "^1.1.1",
18-
"dotkernel/dot-authentication-service": "^1.0",
19-
"dotkernel/dot-authentication-web": "^1.0",
20-
"dotkernel/dot-cache": "^1.1.1",
21-
"dotkernel/dot-console": "^0.1",
22-
"dotkernel/dot-controller": "^1.0",
23-
"dotkernel/dot-controller-plugin-authentication": "^1.0",
24-
"dotkernel/dot-controller-plugin-authorization": "^1.0",
25-
"dotkernel/dot-controller-plugin-flashmessenger": "^1.0",
26-
"dotkernel/dot-controller-plugin-forms": "^1.0",
27-
"dotkernel/dot-controller-plugin-mail": "^1.0",
28-
"dotkernel/dot-controller-plugin-session": "^1.0",
29-
"dotkernel/dot-event": "^0.2",
30-
"dotkernel/dot-filter": "^1.1",
31-
"dotkernel/dot-flashmessenger": "^1.0",
32-
"dotkernel/dot-form": "^1.1",
33-
"dotkernel/dot-helpers": "^1.0",
34-
"dotkernel/dot-hydrator": "^1.1",
35-
"dotkernel/dot-inputfilter": "^1.1",
36-
"dotkernel/dot-log": "^1.1",
37-
"dotkernel/dot-mail": "^1.0",
38-
"dotkernel/dot-mapper": "^1.0",
39-
"dotkernel/dot-navigation": "^1.0",
40-
"dotkernel/dot-paginator": "^1.1",
41-
"dotkernel/dot-rbac": "^0.2.1",
42-
"dotkernel/dot-rbac-guard": "^1.0",
43-
"dotkernel/dot-session": "^3.0",
44-
"dotkernel/dot-twigrenderer": "^1.0",
45-
"dotkernel/dot-user": "^1.0",
46-
"dotkernel/dot-validator": "^1.2.1",
47-
48-
"roave/security-advisories": "dev-master",
49-
"zendframework/zend-captcha": "^2.6",
50-
"zendframework/zend-component-installer": "^2.0",
51-
"zendframework/zend-config": "^3.1",
52-
"zendframework/zend-config-aggregator": "^0.2.0",
53-
"zendframework/zend-db": "^2.8",
54-
"zendframework/zend-expressive": "^3.0",
55-
"zendframework/zend-expressive-fastroute": "^3.0",
56-
"zendframework/zend-expressive-twigrenderer": "^2.0",
57-
"zendframework/zend-i18n": "^2.7",
58-
"zendframework/zend-i18n-resources": "^2.5",
59-
"zendframework/zend-psr7bridge": "^0.2.2",
60-
"zendframework/zend-servicemanager": "^3.3.0",
61-
"zendframework/zend-stdlib": "^3.0",
62-
"zendframework/zend-text": "^2.6",
63-
"zendframework/zendservice-recaptcha": "^3.0"
64-
},
65-
"require-dev": {
66-
"phpunit/phpunit": "^6.0.8 || ^5.7.15",
67-
"squizlabs/php_codesniffer": "^2.8.1",
68-
"zendframework/zend-expressive-tooling": "^1.0",
69-
"filp/whoops": "^2.1.7",
70-
"zfcampus/zf-development-mode": "^3.1"
71-
},
72-
"autoload": {
73-
"psr-4": {
74-
"Admin\\App\\": "src/App/src",
75-
"Admin\\Admin\\": "src/Admin/src",
76-
"Admin\\User\\": "src/User/src",
77-
"Admin\\Console\\": "src/Console/src"
78-
}
79-
},
80-
"autoload-dev": {
81-
"psr-4": {
82-
"AdminTest\\App\\": "test/AppTest/"
83-
}
84-
},
85-
"scripts": {
86-
"post-create-project-cmd": [
87-
"@development-enable"
88-
],
89-
"development-disable": "zf-development-mode disable",
90-
"development-enable": "zf-development-mode enable",
91-
"development-status": "zf-development-mode status",
92-
"check": [
93-
"@cs-check",
94-
"@test"
2+
"name": "dotkernel/admin",
3+
"description": "Dotkernel Admin Application",
4+
"type": "project",
5+
"license": "MIT",
6+
"authors": [
7+
{
8+
"name": "DotKernel Team",
9+
"email": "team@dotkernel.com"
10+
}
9511
],
96-
"clear-config-cache": "php bin/clear-config-cache.php",
97-
"cs-check": "phpcs",
98-
"cs-fix": "phpcbf",
99-
"serve": "php -S 0.0.0.0:8080 -t public public/index.php",
100-
"test": "phpunit --colors=always",
101-
"test-coverage": "phpunit --colors=always --coverage-clover clover.xml",
102-
"upload-coverage": "coveralls -v"
103-
},
104-
"extra": {
105-
"branch-alias": {
106-
"dev-master": "1.0-dev",
107-
"dev-develop": "1.1-dev"
12+
"config": {
13+
"sort-packages": true
14+
},
15+
"require": {
16+
"php": "^7.2",
17+
"dotkernel/dot-annotated-services": "^2.0",
18+
"dotkernel/dot-authentication-service": "^2.0",
19+
"dotkernel/dot-authentication-web": "^2.0",
20+
"dotkernel/dot-cache": "^2.0",
21+
"dotkernel/dot-console": "^2.0",
22+
"dotkernel/dot-controller": "^2.0",
23+
"dotkernel/dot-controller-plugin-authentication": "^2.0",
24+
"dotkernel/dot-controller-plugin-authorization": "^2.0",
25+
"dotkernel/dot-controller-plugin-flashmessenger": "^2.0",
26+
"dotkernel/dot-controller-plugin-forms": "^2.0",
27+
"dotkernel/dot-controller-plugin-mail": "^2.0",
28+
"dotkernel/dot-controller-plugin-session": "^2.0",
29+
"dotkernel/dot-event": "^2.0",
30+
"dotkernel/dot-filter": "^2.0",
31+
"dotkernel/dot-flashmessenger": "^2.0",
32+
"dotkernel/dot-form": "^2.0",
33+
"dotkernel/dot-helpers": "^2.0",
34+
"dotkernel/dot-hydrator": "^2.0",
35+
"dotkernel/dot-inputfilter": "^2.0",
36+
"dotkernel/dot-log": "^2.0",
37+
"dotkernel/dot-mail": "^2.0",
38+
"dotkernel/dot-mapper": "^2.0",
39+
"dotkernel/dot-navigation": "^2.0",
40+
"dotkernel/dot-paginator": "^2.0",
41+
"dotkernel/dot-rbac": "^2.0",
42+
"dotkernel/dot-rbac-guard": "^2.0",
43+
"dotkernel/dot-session": "^4.0",
44+
"dotkernel/dot-twigrenderer": "^2.0",
45+
"dotkernel/dot-user": "^2.0",
46+
"dotkernel/dot-validator": "^2.0",
47+
"roave/security-advisories": "dev-master",
48+
"laminas/laminas-captcha": "^2.6",
49+
"laminas/laminas-component-installer": "^2.0",
50+
"laminas/laminas-config": "^3.1",
51+
"laminas/laminas-config-aggregator": "^0.2.0",
52+
"laminas/laminas-db": "^2.8",
53+
"mezzio/mezzio": "^3.0",
54+
"mezzio/mezzio-fastroute": "^3.0",
55+
"mezzio/mezzio-twigrenderer": "^2.0",
56+
"laminas/laminas-i18n": "^2.7",
57+
"laminas/laminas-i18n-resources": "^2.5",
58+
"laminas/laminas-psr7bridge": "^0.2.2",
59+
"laminas/laminas-servicemanager": "^3.3.0",
60+
"laminas/laminas-stdlib": "^3.0",
61+
"laminas/laminas-text": "^2.6",
62+
"laminas/laminas-recaptcha": "^3.0",
63+
"laminas/laminas-dependency-plugin": "^1.0"
64+
},
65+
"require-dev": {
66+
"phpunit/phpunit": "^6.0.8 || ^5.7.15",
67+
"squizlabs/php_codesniffer": "^2.8.1",
68+
"mezzio/mezzio-tooling": "^1.0",
69+
"filp/whoops": "^2.1.7",
70+
"laminas/laminas-development-mode": "^3.1"
71+
},
72+
"autoload": {
73+
"psr-4": {
74+
"Admin\\App\\": "src/App/src",
75+
"Admin\\Admin\\": "src/Admin/src",
76+
"Admin\\User\\": "src/User/src",
77+
"Admin\\Console\\": "src/Console/src"
78+
}
79+
},
80+
"autoload-dev": {
81+
"psr-4": {
82+
"AdminTest\\App\\": "test/AppTest/"
83+
}
84+
},
85+
"scripts": {
86+
"post-create-project-cmd": [
87+
"@development-enable"
88+
],
89+
"development-disable": "laminas-development-mode disable",
90+
"development-enable": "laminas-development-mode enable",
91+
"development-status": "laminas-development-mode status",
92+
"check": [
93+
"@cs-check",
94+
"@test"
95+
],
96+
"clear-config-cache": "php bin/clear-config-cache.php",
97+
"cs-check": "phpcs",
98+
"cs-fix": "phpcbf",
99+
"serve": "php -S 0.0.0.0:8080 -t public public/index.php",
100+
"test": "phpunit --colors=always",
101+
"test-coverage": "phpunit --colors=always --coverage-clover clover.xml",
102+
"upload-coverage": "coveralls -v"
103+
},
104+
"extra": {
105+
"branch-alias": {
106+
"dev-master": "2.0-dev",
107+
"dev-develop": "2.1-dev"
108+
}
108109
}
109-
}
110110
}

‎config/autoload/dependencies.global.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?php
22

3-
use Zend\Expressive\Application;
4-
use Zend\Expressive\Container;
5-
use Zend\Expressive\Delegate;
6-
use Zend\Expressive\Helper;
7-
use Zend\Expressive\Middleware;
3+
use Mezzio\Application;
4+
use Mezzio\Container;
5+
use Mezzio\Delegate;
6+
use Mezzio\Helper;
7+
use Mezzio\Middleware;
88

99
return [
1010
// Provides application-wide services.
@@ -14,7 +14,7 @@
1414
// Use 'aliases' to alias a service name to another service. The
1515
// key is the alias name, the value is the service to which it points.
1616
'aliases' => [
17-
'Zend\Expressive\Delegate\DefaultDelegate' => Delegate\NotFoundDelegate::class,
17+
'Mezzio\Delegate\DefaultDelegate' => Delegate\NotFoundDelegate::class,
1818
],
1919
// Use 'invokables' for constructor-less services, or services that do
2020
// not require arguments to the constructor. Map a service name to the
@@ -31,7 +31,7 @@
3131
Helper\UrlHelper::class => Helper\UrlHelperFactory::class,
3232
Helper\UrlHelperMiddleware::class => Helper\UrlHelperMiddlewareFactory::class,
3333

34-
Zend\Stratigility\Middleware\ErrorHandler::class => Container\ErrorHandlerFactory::class,
34+
Laminas\Stratigility\Middleware\ErrorHandler::class => Container\ErrorHandlerFactory::class,
3535
Middleware\ErrorResponseGenerator::class => Container\ErrorResponseGeneratorFactory::class,
3636
Middleware\NotFoundHandler::class => Container\NotFoundHandlerFactory::class,
3737
],

‎config/autoload/development.local.php.dist‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,17 @@
1010
* `composer development-enable`.
1111
*/
1212

13-
use Zend\Expressive\Container;
14-
use Zend\Expressive\Middleware\ErrorResponseGenerator;
13+
use Mezzio\Container;
14+
use Mezzio\Middleware\ErrorResponseGenerator;
1515

1616
return [
1717
'dependencies' => [
1818
'invokables' => [
1919
],
2020
'factories' => [
2121
ErrorResponseGenerator::class => Container\WhoopsErrorResponseGeneratorFactory::class,
22-
'Zend\Expressive\Whoops' => Container\WhoopsFactory::class,
23-
'Zend\Expressive\WhoopsPageHandler' => Container\WhoopsPageHandlerFactory::class,
22+
'Mezzio\Whoops' => Container\WhoopsFactory::class,
23+
'Mezzio\WhoopsPageHandler' => Container\WhoopsPageHandlerFactory::class,
2424
],
2525
'lazy_services' => [
2626
'write_proxy_files' => false,

‎config/autoload/log.global.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
use Zend\Log\Logger;
3+
use Laminas\Log\Logger;
44

55
return [
66
'dot_log' => [

‎config/autoload/mail.global.php‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,18 @@
1717

1818
/**
1919
* the mail transport to use
20-
* can be any class implementing Zend\Mail\Transport\TransportInterface
20+
* can be any class implementing Laminas\Mail\Transport\TransportInterface
2121
*
2222
* for standard mail transports, you can use these aliases
23-
* - sendmail => Zend\Mail\Transport\Sendmail
24-
* - smtp => Zend\Mail\Transport\Smtp
25-
* - file => Zend\Mail\Transport\File
26-
* - in_memory => Zend\Mail\Transport\InMemory
23+
* - sendmail => Laminas\Mail\Transport\Sendmail
24+
* - smtp => Laminas\Mail\Transport\Smtp
25+
* - file => Laminas\Mail\Transport\File
26+
* - in_memory => Laminas\Mail\Transport\InMemory
2727
*
2828
* defaults to sendmail
2929
**/
3030

31-
'transport' => \Zend\Mail\Transport\Smtp::class,
31+
'transport' => \Laminas\Mail\Transport\Smtp::class,
3232

3333
//message configuration
3434
'message_options' => [
@@ -85,7 +85,7 @@
8585
],
8686
],
8787

88-
//options that will be used only if Zend\Mail\Transport\Smtp adapter is used
88+
//options that will be used only if Laminas\Mail\Transport\Smtp adapter is used
8989
'smtp_options' => [
9090

9191
//hostname or IP address of the mail server
@@ -112,14 +112,14 @@
112112
]
113113
],
114114

115-
//file options that will be used only if the adapter is Zend\Mail\Transport\File
115+
//file options that will be used only if the adapter is Laminas\Mail\Transport\File
116116
/*'file_options' => [
117117
118118
// this is the folder where the file is going to be saved
119119
// default value is 'data/mail/output'
120120
'path' => 'data/mail/output',
121121
122-
// a callable that will get the Zend\Mail\Transport\File object as an argument
122+
// a callable that will get the Laminas\Mail\Transport\File object as an argument
123123
// and should return the filename
124124
// if null is used, and empty callable will be used
125125
// 'callback' => null,

config/autoload/zend-expressive.global.php renamed to config/autoload/mezzio.global.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
use Zend\ConfigAggregator\ConfigAggregator;
3+
use Laminas\ConfigAggregator\ConfigAggregator;
44

55
return [
66
// Toggle the configuration cache. Set this to boolean false, or remove the
@@ -12,7 +12,7 @@
1212
// Enable debugging; typically used to provide debugging information within templates.
1313
'debug' => false,
1414

15-
'zend-expressive' => [
15+
'mezzio' => [
1616
// Enable exception-based error handling via standard middleware.
1717
'raise_throwables' => true,
1818

0 commit comments

Comments
 (0)