Removed zend-version integration

- Irrelevant starting with v2.5, and impossible to determine unless we spelunk in the composer installed.json.
zendframework · Jun 27, 2016 · 44d9576 · 44d9576
1 parent a3d7c2e
commit 44d9576
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 154 deletions.
diff --git a/CHANGELOG.md 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
@@ -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
diff --git 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
@@ -1,28 +1,13 @@
 <div class="zdt-toolbar-entry">
     <div class="zdt-toolbar-preview">
-        <img alt="Zend Framework 2" src="data:image/jpeg;base64,iVBORw0KGgoAAAANSUhEUgAAAB8AAAAPCAYAAAAceBSiAAAAAXNSR0IArs4c6QAAAAZiS0dEAH8A9wAAMkqpNAAAAAlwSFlzAAAuIwAALiMBeKU/dgAAAAd0SU1FB9wCCwIWGuaXOlYAAAJiSURBVDjLldS/i1xVFAfwz8leJxF/FdFUNjayhYpCkBATxEIwb0D/ADFpIjMgCDGQQtBCIWVAY/EmIGKbRpt9q6CFplIL8UfvL2SLqBBRUHzDsdi3O7Ozb7KbA493udz7Pff7Pd9zYtyUkumrCI/YfxzARvJgcDeeT54Mbs/cP0iBCNEB7i/SNMNxPIBPcCRu4eURMwaS2DNd908Ir0yq9sfgTRxZBN7jyw7xh4KpdA73LGaL8Lf0MoZia8tnddW+PVorgWdvQa0tipFsYHhTxqO18miEr3N29Y9J1R6GcVMCr+PfbfhZgl1Kd/9ppm8nw/ZjbiL3aK0U4TtptZMqUNVVu754drxWHhKOZjoYsYvwivTBZNhu9BpuSVzGagcWeK8v8agpDU7NG6nHYNdsSt0rxyLr0xHen6vUF3XVHtvFuClv4LUdFd0dv9ZVe/+4KSdxEY/hF5wvPYnvjXAps2OS/slwtudcZHphrlX7uyM9060v4Wi3XsWV0iPFhzgcIaXo2ur7Jb16Q/qyx9it9DMuT4bbd1/FIfyEb7ASC2zeifBSpuzYvFtX7dmlpmzKwKZC/9VVm/NmjTCd35sr1Sk0OBdzQI8H13BbpojwZ2ek6zmTcUud63XV3uic/pRwAceSg8Gh5L5J1f7ek/g41nG1rtoXS5d4Jfg0GUSHntwhNRELTtp8yQVcGTflOVyVBjk79NuSxA/jI3yOEZRuUq3jztgebGBF7Jx6He2MNOgecl4YzE0/OLOkSm/hLgwxHTfFgeB08PQe7bLTxrHpdpzoBn5E+gtn6qptllx9YnHjf9NI2tXkjbmCAAAAAElFTkSuQmCC">
-        <span class="zdt-toolbar-info zdt-toolbar-bold<?php echo ($this->is_latest) ? '' : ' zdt-toolbar-color-yellow'; ?>">
-            <?php echo $this->zf_version; ?>
-        </span>
+        <img alt="Zend Framework" src="data:image/jpeg;base64,iVBORw0KGgoAAAANSUhEUgAAAB8AAAAPCAYAAAAceBSiAAAAAXNSR0IArs4c6QAAAAZiS0dEAH8A9wAAMkqpNAAAAAlwSFlzAAAuIwAALiMBeKU/dgAAAAd0SU1FB9wCCwIWGuaXOlYAAAJiSURBVDjLldS/i1xVFAfwz8leJxF/FdFUNjayhYpCkBATxEIwb0D/ADFpIjMgCDGQQtBCIWVAY/EmIGKbRpt9q6CFplIL8UfvL2SLqBBRUHzDsdi3O7Ozb7KbA493udz7Pff7Pd9zYtyUkumrCI/YfxzARvJgcDeeT54Mbs/cP0iBCNEB7i/SNMNxPIBPcCRu4eURMwaS2DNd908Ir0yq9sfgTRxZBN7jyw7xh4KpdA73LGaL8Lf0MoZia8tnddW+PVorgWdvQa0tipFsYHhTxqO18miEr3N29Y9J1R6GcVMCr+PfbfhZgl1Kd/9ppm8nw/ZjbiL3aK0U4TtptZMqUNVVu754drxWHhKOZjoYsYvwivTBZNhu9BpuSVzGagcWeK8v8agpDU7NG6nHYNdsSt0rxyLr0xHen6vUF3XVHtvFuClv4LUdFd0dv9ZVe/+4KSdxEY/hF5wvPYnvjXAps2OS/slwtudcZHphrlX7uyM9060v4Wi3XsWV0iPFhzgcIaXo2ur7Jb16Q/qyx9it9DMuT4bbd1/FIfyEb7ASC2zeifBSpuzYvFtX7dmlpmzKwKZC/9VVm/NmjTCd35sr1Sk0OBdzQI8H13BbpojwZ2ek6zmTcUud63XV3uic/pRwAceSg8Gh5L5J1f7ek/g41nG1rtoXS5d4Jfg0GUSHntwhNRELTtp8yQVcGTflOVyVBjk79NuSxA/jI3yOEZRuUq3jztgebGBF7Jx6He2MNOgecl4YzE0/OLOkSm/hLgwxHTfFgeB08PQe7bLTxrHpdpzoBn5E+gtn6qptllx9YnHjf9NI2tXkjbmCAAAAAElFTkSuQmCC">
         <div class="zdt-toolbar-detail">
-            <?php if (!$this->is_latest): ?>
-                <span class="zdt-toolbar-info">
-                    <span class="zdt-detail-label">New Version</span>
-                    <span class="zdt-detail-value zdt-toolbar-spacing">
-                        <a href="http://packages.zendframework.com/"><?php echo $this->latest; ?></a>
-                    </span>
-                </span>
-            <?php endif; ?>
             <span class="zdt-toolbar-info">
                 <a href="<?php echo $doc_uri ?>">Documentation</a>
             </span>
             <span class="zdt-toolbar-info zdt-toolbar-spacing">
                 <a href="http://modules.zendframework.com/">Modules Gallery</a>
             </span>
-            <span class="zdt-toolbar-info zdt-toolbar-info-redundant">
-                <span class="zdt-detail-label">Version</span>
-                <span class="zdt-detail-value"><?php echo $this->zf_version; ?></span>
-            </span>
             <span class="zdt-toolbar-info">
                 <span class="zdt-detail-label">PHP Version</span>
                 <span class="zdt-detail-value"><?php echo $this->php_version; ?></span>
@@ -35,7 +20,7 @@
                     >intl</span>
                 </span>
             </span>
-            <?php if (isset($this->modules)): ?>
+            <?php if (isset($this->modules)) : ?>
                 <span class="zdt-toolbar-info">
                     <?php echo $this->ZendDeveloperToolsDetailArray('Modules', $this->modules); ?>
                 </span>