Merge branch 'release/1.0.1'

getgrav · Dec 11, 2015 · 2bb23ef · 2bb23ef
2 parents e4e0c06 + def726a
commit 2bb23ef
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 24 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,11 @@
+# v1.0.1
+## 12/11/2015
+
+1. [](#improved)   
+    * Reduced package sizes by removing extra vendor dev bits
+1. [](#bugfix)
+    * Fix issue when you enable debugger from admin plugin
+
 # v1.0.0
 ## 12/11/2015
 

diff --git a/system/defines.php b/system/defines.php
@@ -2,7 +2,7 @@
 
 // Some standard defines
 define('GRAV', true);
-define('GRAV_VERSION', '1.0.0');
+define('GRAV_VERSION', '1.0.1');
 define('DS', '/');
 
 // Directories and Paths

diff --git a/system/src/Grav/Common/Debugger.php b/system/src/Grav/Common/Debugger.php
@@ -15,6 +15,8 @@ class Debugger
     protected $renderer;
     protected $enabled;
 
+    protected $timers = [];
+
     public function __construct()
     {
         $this->debugbar = new StandardDebugBar();
@@ -98,15 +100,17 @@ public function startTimer($name, $description = null)
     {
         if ($name[0] == '_' || $this->grav['config']->get('system.debugger.enabled')) {
             $this->debugbar['time']->startMeasure($name, $description);
+            $this->timers[] = $name;
         }
         return $this;
     }
 
     public function stopTimer($name)
     {
-        if ($name[0] == '_' || $this->grav['config']->get('system.debugger.enabled')) {
+        if (isset($this->timers[$name]) && ($name[0] == '_' || $this->grav['config']->get('system.debugger.enabled'))) {
             $this->debugbar['time']->stopMeasure($name);
         }
+
         return $this;
     }
 

diff --git a/system/src/Grav/Console/Cli/CleanCommand.php b/system/src/Grav/Console/Cli/CleanCommand.php
@@ -121,28 +121,34 @@ class CleanCommand extends ConsoleCommand
         'vendor/rockettheme/toolbox/.travis.yml',
         'vendor/rockettheme/toolbox/composer.json',
         'vendor/rockettheme/toolbox/phpunit.xml',
-        'vendor/symfony/console/Symfony/Component/Console/composer.json',
-        'vendor/symfony/console/Symfony/Component/Console/phpunit.xml.dist',
-        'vendor/symfony/console/Symfony/Component/Console/.gitignore',
-        'vendor/symfony/console/Symfony/Component/Console/.git',
-        'vendor/symfony/console/Symfony/Component/Console/Tests',
-        'vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/.git',
-        'vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/.gitignore',
-        'vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/composer.json',
-        'vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/phpunit.xml.dist',
-        'vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/Tests',
-        'vendor/symfony/yaml/Symfony/Component/Yaml/composer.json',
-        'vendor/symfony/yaml/Symfony/Component/Yaml/phpunit.xml.dist',
-        'vendor/symfony/yaml/Symfony/Component/Yaml/.gitignore',
-        'vendor/symfony/yaml/Symfony/Component/Yaml/.git',
-        'vendor/symfony/yaml/Symfony/Component/Yaml/Tests',
-        'vendor/tracy/tracy/.gitattributes',
-        'vendor/tracy/tracy/.travis.yml',
-        'vendor/tracy/tracy/composer.json',
-        'vendor/tracy/tracy/.gitignore',
-        'vendor/tracy/tracy/.git',
-        'vendor/tracy/tracy/examples',
-        'vendor/tracy/tracy/tests',
+        'vendor/symfony/console/composer.json',
+        'vendor/symfony/console/phpunit.xml.dist',
+        'vendor/symfony/console/.gitignore',
+        'vendor/symfony/console/.git',
+        'vendor/symfony/console/Tester',
+        'vendor/symfony/console/Tests',
+        'vendor/symfony/event-dispatcher/.git',
+        'vendor/symfony/event-dispatcher/.gitignore',
+        'vendor/symfony/event-dispatcher/composer.json',
+        'vendor/symfony/event-dispatcher/phpunit.xml.dist',
+        'vendor/symfony/event-dispatcher/Tests',
+        'vendor/symfony/polyfill-iconv/.git',
+        'vendor/symfony/polyfill-iconv/.gitignore',
+        'vendor/symfony/polyfill-iconv/composer.json',
+        'vendor/symfony/polyfill-mbstring/.git',
+        'vendor/symfony/polyfill-mbstring/.gitignore',
+        'vendor/symfony/polyfill-mbstring/composer.json',
+        'vendor/symfony/var-dumper/.git',
+        'vendor/symfony/var-dumper/.gitignore',
+        'vendor/symfony/var-dumper/composer.json',
+        'vendor/symfony/var-dumper/phpunit.xml.dist',
+        'vendor/symfony/var-dumper/Test',
+        'vendor/symfony/var-dumper/Tests',
+        'vendor/symfony/yaml/composer.json',
+        'vendor/symfony/yaml/phpunit.xml.dist',
+        'vendor/symfony/yaml/.gitignore',
+        'vendor/symfony/yaml/.git',
+        'vendor/symfony/yaml/Tests',
         'vendor/twig/twig/.editorconfig',
         'vendor/twig/twig/.travis.yml',
         'vendor/twig/twig/.gitignore',