diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..bf9aa13 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,26 @@ +# Changelog + +All notable changes to this project will be documented in this file, in reverse chronological order by release. + +## 1.1.0 - 2016-06-27 + +### Added + +- [#213](https://github.com/zendframework/ZendDeveloperTools/pull/213) adds + support for zend-mvc, zend-eventmanager, and zend-servicemanager v3. + +### Deprecated + +- Nothing. + +### Removed + +- Nothing. + +### Fixed + +- Nothing. + +## 1.0.0 - 2016-06-27 + +First stable release. diff --git a/composer.json b/composer.json index 76949d4..7f8ea28 100644 --- a/composer.json +++ b/composer.json @@ -36,13 +36,12 @@ "zendframework/zend-stdlib": "^2.7 || ^3.0", "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3", "zendframework/zend-modulemanager": "^2.7", - "zendframework/zend-version": "^2.5", "zendframework/zend-debug": "^2.5 || ^3.0", "zendframework/zend-view": "^2.6" }, "require-dev": { - "phpunit/phpunit": "^4.8 || ^5.0", - "squizlabs/php_codesniffer": "~2.3.1" + "phpunit/phpunit": "^4.8 || ^5.0", + "squizlabs/php_codesniffer": "~2.3.1" }, "suggest": { "bjyoungblood/bjy-profiler": "Version: dev-master, allows the usage of the (Zend) Db collector.", diff --git a/composer.lock b/composer.lock index c25a50c..fca0403 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "d3aac4379a034f0785d267d5f4b4c083", - "content-hash": "f4441c4e0a410a7a2d9b21f31641c717", + "hash": "bf4218c4e83eed8651f4c9e3cab4dae1", + "content-hash": "70c64b46ecf4198088b51830c8835cbc", "packages": [ { "name": "container-interop/container-interop", @@ -287,61 +287,6 @@ ], "time": "2016-02-04 20:36:48" }, - { - "name": "zendframework/zend-json", - "version": "2.6.1", - "source": { - "type": "git", - "url": "https://github.com/zendframework/zend-json.git", - "reference": "4c8705dbe4ad7d7e51b2876c5b9eea0ef916ba28" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-json/zipball/4c8705dbe4ad7d7e51b2876c5b9eea0ef916ba28", - "reference": "4c8705dbe4ad7d7e51b2876c5b9eea0ef916ba28", - "shasum": "" - }, - "require": { - "php": "^5.5 || ^7.0" - }, - "require-dev": { - "fabpot/php-cs-fixer": "1.7.*", - "phpunit/phpunit": "~4.0", - "zendframework/zend-http": "^2.5.4", - "zendframework/zend-server": "^2.6.1", - "zendframework/zend-stdlib": "^2.5 || ^3.0", - "zendframework/zendxml": "^1.0.2" - }, - "suggest": { - "zendframework/zend-http": "Zend\\Http component, required to use Zend\\Json\\Server", - "zendframework/zend-server": "Zend\\Server component, required to use Zend\\Json\\Server", - "zendframework/zend-stdlib": "Zend\\Stdlib component, for use with caching Zend\\Json\\Server responses", - "zendframework/zendxml": "To support Zend\\Json\\Json::fromXml() usage" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.6-dev", - "dev-develop": "2.7-dev" - } - }, - "autoload": { - "psr-4": { - "Zend\\Json\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "description": "provides convenience methods for serializing native PHP to JSON and decoding JSON to native PHP", - "homepage": "https://github.com/zendframework/zend-json", - "keywords": [ - "json", - "zf2" - ], - "time": "2016-02-04 21:20:26" - }, { "name": "zendframework/zend-loader", "version": "2.5.1", @@ -789,56 +734,6 @@ ], "time": "2016-06-23 13:44:31" }, - { - "name": "zendframework/zend-version", - "version": "2.5.1", - "source": { - "type": "git", - "url": "https://github.com/zendframework/zend-version.git", - "reference": "e30c55dc394eaf396f0347887af0a7bef471fe08" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-version/zipball/e30c55dc394eaf396f0347887af0a7bef471fe08", - "reference": "e30c55dc394eaf396f0347887af0a7bef471fe08", - "shasum": "" - }, - "require": { - "php": ">=5.3.23", - "zendframework/zend-json": "~2.5" - }, - "require-dev": { - "fabpot/php-cs-fixer": "1.7.*", - "phpunit/phpunit": "~4.0", - "zendframework/zend-http": "~2.5" - }, - "suggest": { - "zendframework/zend-http": "Allows use of Zend\\Http\\Client to check version information", - "zendframework/zend-json": "To check latest version hosted in GitHub" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.5-dev", - "dev-develop": "2.6-dev" - } - }, - "autoload": { - "psr-4": { - "Zend\\Version\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "homepage": "https://github.com/zendframework/zend-version", - "keywords": [ - "version", - "zf2" - ], - "time": "2015-06-04 15:41:05" - }, { "name": "zendframework/zend-view", "version": "2.8.0", diff --git a/src/Listener/ToolbarListener.php b/src/Listener/ToolbarListener.php index 257e62f..d285309 100644 --- a/src/Listener/ToolbarListener.php +++ b/src/Listener/ToolbarListener.php @@ -18,7 +18,6 @@ namespace ZendDeveloperTools\Listener; -use Zend\Version\Version; use Zend\View\Model\ViewModel; use Zend\View\Exception\RuntimeException; use ZendDeveloperTools\Options; @@ -47,19 +46,12 @@ class ToolbarListener implements ListenerAggregateInterface */ const VERSION_CACHE_TTL = 3600; - /** - * Dev documentation URI pattern. - * - * @var string - */ - const DEV_DOC_URI_PATTERN = 'http://zf2.readthedocs.org/en/%s/index.html'; - /** * Documentation URI pattern. * * @var string */ - const DOC_URI_PATTERN = 'http://framework.zend.com/manual/%s/en/index.html'; + const DOC_URI = 'https://docs.zendframework.com/'; /** * @var object @@ -167,27 +159,10 @@ protected function renderEntries(ProfilerEvent $event) { $entries = []; $report = $event->getReport(); - - list($isLatest, $latest) = $this->getLatestVersion(Version::VERSION); - - if (false === ($pos = strpos(Version::VERSION, 'dev'))) { - $docUri = sprintf(self::DOC_URI_PATTERN, substr(Version::VERSION, 0, 3)); - } else { // unreleased dev branch - compare minor part of versions - $partsCurrent = explode('.', substr(Version::VERSION, 0, $pos)); - $partsLatestRelease = explode('.', $latest); - $docUri = sprintf( - self::DEV_DOC_URI_PATTERN, - current($partsLatestRelease) == $partsCurrent[1] ? 'latest' : 'develop' - ); - } - $zfEntry = new ViewModel([ - 'zf_version' => Version::VERSION, - 'is_latest' => $isLatest, - 'latest' => $latest, 'php_version' => phpversion(), 'has_intl' => extension_loaded('intl'), - 'doc_uri' => $docUri, + 'doc_uri' => self::DOC_URI, 'modules' => $this->getModules($event), ]); $zfEntry->setTemplate('zend-developer-tools/toolbar/zendframework'); diff --git a/view/zend-developer-tools/toolbar/zendframework.phtml b/view/zend-developer-tools/toolbar/zendframework.phtml index cecfe09..3adc61d 100644 --- a/view/zend-developer-tools/toolbar/zendframework.phtml +++ b/view/zend-developer-tools/toolbar/zendframework.phtml @@ -1,28 +1,13 @@
- Zend Framework 2 - - zf_version; ?> - + Zend Framework
- is_latest): ?> - - New Version - - latest; ?> - - - Documentation Modules Gallery - - Version - zf_version; ?> - PHP Version php_version; ?> @@ -35,7 +20,7 @@ >intl - modules)): ?> + modules)) : ?> ZendDeveloperToolsDetailArray('Modules', $this->modules); ?>