Skip to content
This repository was archived by the owner on Jan 29, 2020. It is now read-only.

Commit 456dd02

Browse files
weierophinneyweierophinney
committed
Merge branch 'hotfix/353'
Close #353
2 parents 37d15a3 + dd2d6cb commit 456dd02

26 files changed

+28
-66
lines changed

‎.docheader

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
/**
2+
* @see https://github.com/zendframework/zend-expressive for the canonical source repository
3+
* @copyright Copyright (c) 2015-%year% Zend Technologies USA Inc. (http://www.zend.com)
4+
* @license https://github.com/zendframework/zend-expressive/blob/master/LICENSE.md New BSD License
5+
*/

‎.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ script:
4646
- if [[ $EXECUTE_TEST_COVERALLS == 'true' ]]; then composer test-coverage ; fi
4747
- if [[ $EXECUTE_TEST_COVERALLS != 'true' ]]; then composer test ; fi
4848
- if [[ $EXECUTE_CS_CHECK == 'true' ]]; then composer cs ; fi
49+
- if [[ $EXECUTE_CS_CHECK == 'true' ]]; then composer license-check ; fi
4950
- if [[ $DEPLOY_DOCS == "true" && "$TRAVIS_TEST_RESULT" == "0" ]]; then wget -O theme-installer.sh "https://raw.githubusercontent.com/zendframework/zf-mkdoc-theme/master/theme-installer.sh" ; chmod 755 theme-installer.sh ; ./theme-installer.sh ; fi
5051

5152
after_script:

‎composer.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@
3131
"zendframework/zend-expressive-aurarouter": "^1.0",
3232
"zendframework/zend-expressive-fastroute": "^1.0",
3333
"zendframework/zend-expressive-zendrouter": "^1.0",
34-
"zendframework/zend-servicemanager": "^2.6"
34+
"zendframework/zend-servicemanager": "^2.6",
35+
"malukenho/docheader": "^0.1.0"
3536
},
3637
"autoload": {
3738
"psr-4": {
@@ -65,6 +66,7 @@
6566
"cs": "phpcs",
6667
"cs-fix": "phpcbf",
6768
"test": "phpunit",
68-
"test-coverage": "phpunit --coverage-clover clover.xml"
69+
"test-coverage": "phpunit --coverage-clover clover.xml",
70+
"license-check": "vendor/bin/docheader check src/"
6971
}
7072
}

‎src/AppFactory.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
<?php
22
/**
3-
* Zend Framework (http://framework.zend.com/)
4-
*
53
* @see https://github.com/zendframework/zend-expressive for the canonical source repository
64
* @copyright Copyright (c) 2015-2016 Zend Technologies USA Inc. (http://www.zend.com)
75
* @license https://github.com/zendframework/zend-expressive/blob/master/LICENSE.md New BSD License

‎src/Application.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
<?php
22
/**
3-
* Zend Framework (http://framework.zend.com/)
4-
*
53
* @see https://github.com/zendframework/zend-expressive for the canonical source repository
64
* @copyright Copyright (c) 2015-2016 Zend Technologies USA Inc. (http://www.zend.com)
75
* @license https://github.com/zendframework/zend-expressive/blob/master/LICENSE.md New BSD License

‎src/Container/ApplicationFactory.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
<?php
22
/**
3-
* Zend Framework (http://framework.zend.com/)
4-
*
53
* @see https://github.com/zendframework/zend-expressive for the canonical source repository
64
* @copyright Copyright (c) 2015-2016 Zend Technologies USA Inc. (http://www.zend.com)
75
* @license https://github.com/zendframework/zend-expressive/blob/master/LICENSE.md New BSD License

‎src/Container/Exception/ExceptionInterface.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
<?php
22
/**
3-
* Zend Framework (http://framework.zend.com/)
4-
*
5-
* @see http://github.com/zendframework/zend-expressive for the canonical source repository
3+
* @see https://github.com/zendframework/zend-expressive for the canonical source repository
64
* @copyright Copyright (c) 2015-2016 Zend Technologies USA Inc. (http://www.zend.com)
75
* @license https://github.com/zendframework/zend-expressive/blob/master/LICENSE.md New BSD License
86
*/

‎src/Container/Exception/InvalidArgumentException.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
<?php
22
/**
3-
* Zend Framework (http://framework.zend.com/)
4-
*
5-
* @see http://github.com/zendframework/zend-expressive for the canonical source repository
3+
* @see https://github.com/zendframework/zend-expressive for the canonical source repository
64
* @copyright Copyright (c) 2015-2016 Zend Technologies USA Inc. (http://www.zend.com)
75
* @license https://github.com/zendframework/zend-expressive/blob/master/LICENSE.md New BSD License
86
*/

‎src/Container/Exception/InvalidServiceException.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
<?php
22
/**
3-
* Zend Framework (http://framework.zend.com/)
4-
*
5-
* @see http://github.com/zendframework/zend-expressive for the canonical source repository
3+
* @see https://github.com/zendframework/zend-expressive for the canonical source repository
64
* @copyright Copyright (c) 2015-2016 Zend Technologies USA Inc. (http://www.zend.com)
75
* @license https://github.com/zendframework/zend-expressive/blob/master/LICENSE.md New BSD License
86
*/

‎src/Container/Exception/NotFoundException.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
<?php
22
/**
3-
* Zend Framework (http://framework.zend.com/)
4-
*
5-
* @see http://github.com/zendframework/zend-expressive for the canonical source repository
3+
* @see https://github.com/zendframework/zend-expressive for the canonical source repository
64
* @copyright Copyright (c) 2015-2016 Zend Technologies USA Inc. (http://www.zend.com)
75
* @license https://github.com/zendframework/zend-expressive/blob/master/LICENSE.md New BSD License
86
*/

‎src/Container/TemplatedErrorHandlerFactory.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
<?php
22
/**
3-
* Zend Framework (http://framework.zend.com/)
4-
*
53
* @see https://github.com/zendframework/zend-expressive for the canonical source repository
64
* @copyright Copyright (c) 2015-2016 Zend Technologies USA Inc. (http://www.zend.com)
75
* @license https://github.com/zendframework/zend-expressive/blob/master/LICENSE.md New BSD License

‎src/Container/WhoopsErrorHandlerFactory.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
<?php
22
/**
3-
* Zend Framework (http://framework.zend.com/)
4-
*
53
* @see https://github.com/zendframework/zend-expressive for the canonical source repository
64
* @copyright Copyright (c) 2015-2016 Zend Technologies USA Inc. (http://www.zend.com)
75
* @license https://github.com/zendframework/zend-expressive/blob/master/LICENSE.md New BSD License

‎src/Container/WhoopsFactory.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
<?php
22
/**
3-
* Zend Framework (http://framework.zend.com/)
4-
*
53
* @see https://github.com/zendframework/zend-expressive for the canonical source repository
64
* @copyright Copyright (c) 2015-2016 Zend Technologies USA Inc. (http://www.zend.com)
75
* @license https://github.com/zendframework/zend-expressive/blob/master/LICENSE.md New BSD License

‎src/Container/WhoopsPageHandlerFactory.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
<?php
22
/**
3-
* Zend Framework (http://framework.zend.com/)
4-
*
53
* @see https://github.com/zendframework/zend-expressive for the canonical source repository
64
* @copyright Copyright (c) 2015-2016 Zend Technologies USA Inc. (http://www.zend.com)
75
* @license https://github.com/zendframework/zend-expressive/blob/master/LICENSE.md New BSD License

‎src/Emitter/EmitterStack.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
<?php
22
/**
3-
* Zend Framework (http://framework.zend.com/)
4-
*
53
* @see https://github.com/zendframework/zend-expressive for the canonical source repository
64
* @copyright Copyright (c) 2015-2016 Zend Technologies USA Inc. (http://www.zend.com)
75
* @license https://github.com/zendframework/zend-expressive/blob/master/LICENSE.md New BSD License

‎src/ErrorMiddlewarePipe.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
<?php
22
/**
3-
* Zend Framework (http://framework.zend.com/)
4-
*
53
* @see https://github.com/zendframework/zend-expressive for the canonical source repository
64
* @copyright Copyright (c) 2015-2016 Zend Technologies USA Inc. (http://www.zend.com)
75
* @license https://github.com/zendframework/zend-expressive/blob/master/LICENSE.md New BSD License

‎src/Exception/BadMethodCallException.php

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
<?php
22
/**
3-
* Zend Framework (http://framework.zend.com/)
4-
*
5-
* @link https://github.com/zendframework/zf2 for the canonical source repository
6-
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
7-
* @license http://framework.zend.com/license/new-bsd New BSD License
3+
* @see https://github.com/zendframework/zend-expressive for the canonical source repository
4+
* @copyright Copyright (c) 2015-2016 Zend Technologies USA Inc. (http://www.zend.com)
5+
* @license https://github.com/zendframework/zend-expressive/blob/master/LICENSE.md New BSD License
86
*/
97

108
namespace Zend\Expressive\Exception;

‎src/Exception/ContainerNotRegisteredException.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
<?php
22
/**
3-
* Zend Framework (http://framework.zend.com/)
4-
*
53
* @see https://github.com/zendframework/zend-expressive for the canonical source repository
64
* @copyright Copyright (c) 2015-2016 Zend Technologies USA Inc. (http://www.zend.com)
75
* @license https://github.com/zendframework/zend-expressive/blob/master/LICENSE.md New BSD License

‎src/Exception/DuplicateRouteException.php

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
<?php
22
/**
3-
* Zend Framework (http://framework.zend.com/)
4-
*
5-
* @link https://github.com/zendframework/zf2 for the canonical source repository
6-
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
7-
* @license http://framework.zend.com/license/new-bsd New BSD License
3+
* @see https://github.com/zendframework/zend-expressive for the canonical source repository
4+
* @copyright Copyright (c) 2015-2016 Zend Technologies USA Inc. (http://www.zend.com)
5+
* @license https://github.com/zendframework/zend-expressive/blob/master/LICENSE.md New BSD License
86
*/
97

108
namespace Zend\Expressive\Exception;

‎src/Exception/ExceptionInterface.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
<?php
22
/**
3-
* Zend Framework (http://framework.zend.com/)
4-
*
53
* @see https://github.com/zendframework/zend-expressive for the canonical source repository
64
* @copyright Copyright (c) 2015-2016 Zend Technologies USA Inc. (http://www.zend.com)
75
* @license https://github.com/zendframework/zend-expressive/blob/master/LICENSE.md New BSD License

‎src/Exception/InvalidArgumentException.php

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
<?php
22
/**
3-
* Zend Framework (http://framework.zend.com/)
4-
*
5-
* @link https://github.com/zendframework/zf2 for the canonical source repository
6-
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
7-
* @license http://framework.zend.com/license/new-bsd New BSD License
3+
* @see https://github.com/zendframework/zend-expressive for the canonical source repository
4+
* @copyright Copyright (c) 2015-2016 Zend Technologies USA Inc. (http://www.zend.com)
5+
* @license https://github.com/zendframework/zend-expressive/blob/master/LICENSE.md New BSD License
86
*/
97

108
namespace Zend\Expressive\Exception;

‎src/Exception/InvalidMiddlewareException.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
<?php
22
/**
3-
* Zend Framework (http://framework.zend.com/)
4-
*
53
* @see https://github.com/zendframework/zend-expressive for the canonical source repository
64
* @copyright Copyright (c) 2015-2016 Zend Technologies USA Inc. (http://www.zend.com)
75
* @license https://github.com/zendframework/zend-expressive/blob/master/LICENSE.md New BSD License

‎src/Exception/RuntimeException.php

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
<?php
22
/**
3-
* Zend Framework (http://framework.zend.com/)
4-
*
5-
* @link https://github.com/zendframework/zf2 for the canonical source repository
6-
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
7-
* @license http://framework.zend.com/license/new-bsd New BSD License
3+
* @see https://github.com/zendframework/zend-expressive for the canonical source repository
4+
* @copyright Copyright (c) 2015-2016 Zend Technologies USA Inc. (http://www.zend.com)
5+
* @license https://github.com/zendframework/zend-expressive/blob/master/LICENSE.md New BSD License
86
*/
97

108
namespace Zend\Expressive\Exception;

‎src/MarshalMiddlewareTrait.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
<?php
22
/**
3-
* Zend Framework (http://framework.zend.com/)
4-
*
53
* @see https://github.com/zendframework/zend-expressive for the canonical source repository
64
* @copyright Copyright (c) 2015-2016 Zend Technologies USA Inc. (http://www.zend.com)
75
* @license https://github.com/zendframework/zend-expressive/blob/master/LICENSE.md New BSD License

‎src/TemplatedErrorHandler.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
<?php
22
/**
3-
* Zend Framework (http://framework.zend.com/)
4-
*
5-
* @see http://github.com/zendframework/zend-expressive for the canonical source repository
3+
* @see https://github.com/zendframework/zend-expressive for the canonical source repository
64
* @copyright Copyright (c) 2015-2016 Zend Technologies USA Inc. (http://www.zend.com)
75
* @license https://github.com/zendframework/zend-expressive/blob/master/LICENSE.md New BSD License
86
*/

‎src/WhoopsErrorHandler.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
<?php
22
/**
3-
* Zend Framework (http://framework.zend.com/)
4-
*
5-
* @see http://github.com/zendframework/zend-expressive for the canonical source repository
3+
* @see https://github.com/zendframework/zend-expressive for the canonical source repository
64
* @copyright Copyright (c) 2015-2016 Zend Technologies USA Inc. (http://www.zend.com)
75
* @license https://github.com/zendframework/zend-expressive/blob/master/LICENSE.md New BSD License
86
*/

0 commit comments

Comments
 (0)