Merge branch 'develop'

petrknap · Sep 19, 2016 · b2bcb9b · b2bcb9b
2 parents b93233c + deb225c
commit b2bcb9b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/src/Profiler/AdvancedProfiler.php b/src/Profiler/AdvancedProfiler.php
@@ -14,7 +14,7 @@ class AdvancedProfiler extends SimpleProfiler
     /**
      * @var callable
      */
-    private static $postProcessor = null;
+    protected static $postProcessor = null;
 
     /**
      * Set post processor

diff --git a/src/Profiler/SimpleProfiler.php b/src/Profiler/SimpleProfiler.php
@@ -48,6 +48,14 @@ public static function disable()
         self::$enabled = false;
     }
 
+    /**
+     * @return bool true if profiler is enabled, otherwise false
+     */
+    public static function isEnabled()
+    {
+        return self::$enabled;
+    }
+
     /**
      * Start profiling
      *

diff --git a/tests/Profiler/SimpleProfilerTest.php b/tests/Profiler/SimpleProfilerTest.php
@@ -36,6 +36,7 @@ public function testEnable()
     {
         SimpleProfiler::enable();
 
+        $this->assertTrue(SimpleProfiler::isEnabled());
         $this->assertTrue(SimpleProfiler::start());
         $this->assertInstanceOf(get_class(new Profile()), SimpleProfiler::finish());
     }
@@ -44,6 +45,7 @@ public function testDisable()
     {
         SimpleProfiler::disable();
 
+        $this->assertFalse(SimpleProfiler::isEnabled());
         $this->assertFalse(SimpleProfiler::start());
         $this->assertFalse(SimpleProfiler::finish());
     }