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

Bump minimum php to 7.1 and bump next version to major #77

Merged
merged 5 commits into from Dec 2, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
23 changes: 1 addition & 22 deletions .travis.yml
Expand Up @@ -13,26 +13,6 @@ env:

matrix:
include:
- php: 5.6
env:
- DEPS=lowest
- php: 5.6
env:
- DEPS=locked
- LEGACY_DEPS="phpunit/phpunit zendframework/zend-code"
- php: 5.6
env:
- DEPS=latest
- php: 7
env:
- DEPS=lowest
- php: 7
env:
- DEPS=locked
- LEGACY_DEPS="phpunit/phpunit zendframework/zend-code"
- php: 7
env:
- DEPS=latest
- php: 7.1
env:
- DEPS=lowest
Expand All @@ -58,8 +38,7 @@ before_install:
- if [[ $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi

install:
- travis_retry composer install $COMPOSER_ARGS --ignore-platform-reqs
- if [[ $LEGACY_DEPS != '' ]]; then travis_retry composer update $COMPOSER_ARGS --with-dependencies $LEGACY_DEPS ; fi
- travis_retry composer install $COMPOSER_ARGS
- if [[ $DEPS == 'latest' ]]; then travis_retry composer update $COMPOSER_ARGS ; fi
- if [[ $DEPS == 'lowest' ]]; then travis_retry composer update --prefer-lowest --prefer-stable $COMPOSER_ARGS ; fi
- if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry composer require --dev $COMPOSER_ARGS $COVERAGE_DEPS ; fi
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
Expand Up @@ -2,7 +2,7 @@

All notable changes to this project will be documented in this file, in reverse chronological order by release.

## 2.9.0 - TBD
## 3.0.0 - TBD

### Added

Expand Down
8 changes: 4 additions & 4 deletions composer.json
Expand Up @@ -16,7 +16,7 @@
"forum": "https://discourse.zendframework.com/c/questions/components"
},
"require": {
"php": "^5.6 || ^7.0",
"php": "^7.1",
"zendframework/zend-config": "^3.1 || ^2.6",
"zendframework/zend-eventmanager": "^3.2 || ^2.6.3",
"zendframework/zend-stdlib": "^3.1 || ^2.7"
Expand All @@ -27,7 +27,7 @@
"zendframework/zend-loader": "^2.5",
"zendframework/zend-mvc": "^3.0 || ^2.7",
"zendframework/zend-servicemanager": "^3.0.3 || ^2.7.5",
"phpunit/phpunit": "^6.0.8 || ^5.7.15",
"phpunit/phpunit": "^6.5.2",
"zendframework/zend-coding-standard": "~1.0.0"
},
"suggest": {
Expand Down Expand Up @@ -57,8 +57,8 @@
},
"extra": {
"branch-alias": {
"dev-master": "2.7-dev",
"dev-develop": "2.8-dev"
"dev-master": "2.8-dev",
"dev-develop": "3.0-dev"
}
},
"scripts": {
Expand Down
41 changes: 22 additions & 19 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 4 additions & 5 deletions src/Exception/ExceptionInterface.php
@@ -1,11 +1,10 @@
<?php
/**
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @link http://github.com/zendframework/zend-modulemanager for the canonical source repository
* @copyright Copyright (c) 2005-2017 Zend Technologies USA Inc. (http://www.zend.com)
* @license https://github.com/zendframework/zend-modulemanager/blob/master/LICENSE.md New BSD License
*/
declare(strict_types=1);

namespace Zend\ModuleManager\Exception;

Expand Down
9 changes: 4 additions & 5 deletions src/Exception/InvalidArgumentException.php
@@ -1,11 +1,10 @@
<?php
/**
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @link http://github.com/zendframework/zend-modulemanager for the canonical source repository
* @copyright Copyright (c) 2005-2017 Zend Technologies USA Inc. (http://www.zend.com)
* @license https://github.com/zendframework/zend-modulemanager/blob/master/LICENSE.md New BSD License
*/
declare(strict_types=1);

namespace Zend\ModuleManager\Exception;

Expand Down
9 changes: 4 additions & 5 deletions src/Exception/MissingDependencyModuleException.php
@@ -1,11 +1,10 @@
<?php
/**
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @link http://github.com/zendframework/zend-modulemanager for the canonical source repository
* @copyright Copyright (c) 2005-2017 Zend Technologies USA Inc. (http://www.zend.com)
* @license https://github.com/zendframework/zend-modulemanager/blob/master/LICENSE.md New BSD License
*/
declare(strict_types=1);

namespace Zend\ModuleManager\Exception;

Expand Down
9 changes: 4 additions & 5 deletions src/Exception/RuntimeException.php
@@ -1,11 +1,10 @@
<?php
/**
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @link http://github.com/zendframework/zend-modulemanager for the canonical source repository
* @copyright Copyright (c) 2005-2017 Zend Technologies USA Inc. (http://www.zend.com)
* @license https://github.com/zendframework/zend-modulemanager/blob/master/LICENSE.md New BSD License
*/
declare(strict_types=1);

namespace Zend\ModuleManager\Exception;

Expand Down
9 changes: 4 additions & 5 deletions src/Feature/AutoloaderProviderInterface.php
@@ -1,11 +1,10 @@
<?php
/**
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @link http://github.com/zendframework/zend-modulemanager for the canonical source repository
* @copyright Copyright (c) 2005-2017 Zend Technologies USA Inc. (http://www.zend.com)
* @license https://github.com/zendframework/zend-modulemanager/blob/master/LICENSE.md New BSD License
*/
declare(strict_types=1);

namespace Zend\ModuleManager\Feature;

Expand Down
9 changes: 4 additions & 5 deletions src/Feature/BootstrapListenerInterface.php
@@ -1,11 +1,10 @@
<?php
/**
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @link http://github.com/zendframework/zend-modulemanager for the canonical source repository
* @copyright Copyright (c) 2005-2017 Zend Technologies USA Inc. (http://www.zend.com)
* @license https://github.com/zendframework/zend-modulemanager/blob/master/LICENSE.md New BSD License
*/
declare(strict_types=1);

namespace Zend\ModuleManager\Feature;

Expand Down
9 changes: 4 additions & 5 deletions src/Feature/ConfigProviderInterface.php
@@ -1,11 +1,10 @@
<?php
/**
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @link http://github.com/zendframework/zend-modulemanager for the canonical source repository
* @copyright Copyright (c) 2005-2017 Zend Technologies USA Inc. (http://www.zend.com)
* @license https://github.com/zendframework/zend-modulemanager/blob/master/LICENSE.md New BSD License
*/
declare(strict_types=1);

namespace Zend\ModuleManager\Feature;

Expand Down
9 changes: 4 additions & 5 deletions src/Feature/ConsoleBannerProviderInterface.php
@@ -1,11 +1,10 @@
<?php
/**
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @link http://github.com/zendframework/zend-modulemanager for the canonical source repository
* @copyright Copyright (c) 2005-2017 Zend Technologies USA Inc. (http://www.zend.com)
* @license https://github.com/zendframework/zend-modulemanager/blob/master/LICENSE.md New BSD License
*/
declare(strict_types=1);

namespace Zend\ModuleManager\Feature;

Expand Down
9 changes: 4 additions & 5 deletions src/Feature/ConsoleUsageProviderInterface.php
@@ -1,11 +1,10 @@
<?php
/**
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @link http://github.com/zendframework/zend-modulemanager for the canonical source repository
* @copyright Copyright (c) 2005-2017 Zend Technologies USA Inc. (http://www.zend.com)
* @license https://github.com/zendframework/zend-modulemanager/blob/master/LICENSE.md New BSD License
*/
declare(strict_types=1);

namespace Zend\ModuleManager\Feature;

Expand Down
9 changes: 4 additions & 5 deletions src/Feature/ControllerPluginProviderInterface.php
@@ -1,11 +1,10 @@
<?php
/**
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @link http://github.com/zendframework/zend-modulemanager for the canonical source repository
* @copyright Copyright (c) 2005-2017 Zend Technologies USA Inc. (http://www.zend.com)
* @license https://github.com/zendframework/zend-modulemanager/blob/master/LICENSE.md New BSD License
*/
declare(strict_types=1);

namespace Zend\ModuleManager\Feature;

Expand Down
9 changes: 4 additions & 5 deletions src/Feature/ControllerProviderInterface.php
@@ -1,11 +1,10 @@
<?php
/**
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @link http://github.com/zendframework/zend-modulemanager for the canonical source repository
* @copyright Copyright (c) 2005-2017 Zend Technologies USA Inc. (http://www.zend.com)
* @license https://github.com/zendframework/zend-modulemanager/blob/master/LICENSE.md New BSD License
*/
declare(strict_types=1);

namespace Zend\ModuleManager\Feature;

Expand Down
9 changes: 4 additions & 5 deletions src/Feature/DependencyIndicatorInterface.php
@@ -1,11 +1,10 @@
<?php
/**
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @link http://github.com/zendframework/zend-modulemanager for the canonical source repository
* @copyright Copyright (c) 2005-2017 Zend Technologies USA Inc. (http://www.zend.com)
* @license https://github.com/zendframework/zend-modulemanager/blob/master/LICENSE.md New BSD License
*/
declare(strict_types=1);

namespace Zend\ModuleManager\Feature;

Expand Down
9 changes: 4 additions & 5 deletions src/Feature/FilterProviderInterface.php
@@ -1,11 +1,10 @@
<?php
/**
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @link http://github.com/zendframework/zend-modulemanager for the canonical source repository
* @copyright Copyright (c) 2005-2017 Zend Technologies USA Inc. (http://www.zend.com)
* @license https://github.com/zendframework/zend-modulemanager/blob/master/LICENSE.md New BSD License
*/
declare(strict_types=1);

namespace Zend\ModuleManager\Feature;

Expand Down
9 changes: 4 additions & 5 deletions src/Feature/FormElementProviderInterface.php
@@ -1,11 +1,10 @@
<?php
/**
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @link http://github.com/zendframework/zend-modulemanager for the canonical source repository
* @copyright Copyright (c) 2005-2017 Zend Technologies USA Inc. (http://www.zend.com)
* @license https://github.com/zendframework/zend-modulemanager/blob/master/LICENSE.md New BSD License
*/
declare(strict_types=1);

namespace Zend\ModuleManager\Feature;

Expand Down