Add coverage for memory limit increases.

Include tests for common memory limits. Refs #7550
cakephp · Dec 28, 2015 · 0c541b7 · 0c541b7
1 parent a77d0c4
commit 0c541b7
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 13 deletions.
diff --git a/src/Error/BaseErrorHandler.php b/src/Error/BaseErrorHandler.php
@@ -76,8 +76,8 @@ public function register()
             if ($megabytes === null) {
                 $megabytes = 4;
             }
-            if ($megabytes !== false && $megabytes > 0) {
-                static::increaseMemoryLimit($megabytes * 1024);
+            if ($megabytes > 0) {
+                $this->increaseMemoryLimit($megabytes * 1024);
             }
             $error = error_get_last();
             if (!is_array($error)) {
@@ -93,7 +93,7 @@ public function register()
             }
             $this->handleFatalError(
                 $error['type'],
-                $error['message'],
+               $error['message'],
                 $error['file'],
                 $error['line']
             );
@@ -222,30 +222,30 @@ public function handleFatalError($code, $description, $file, $line)
     /**
      * Increases the PHP "memory_limit" ini setting by the specified amount
      * in kilobytes
-     * 
+     *
      * @param string $additionalKb Number in kilobytes
      * @return void
      */
-    public static function increaseMemoryLimit($additionalKb)
+    public function increaseMemoryLimit($additionalKb)
     {
-        $limit = ini_get("memory_limit");
-        if (!is_string($limit) || !strlen($limit)) {
+        $limit = ini_get('memory_limit');
+        if (!strlen($limit) || $limit === '-1') {
             return;
         }
         $limit = trim($limit);
         $units = strtoupper(substr($limit, -1));
         $current = substr($limit, 0, strlen($limit) - 1);
-        if ($units === "M") {
+        if ($units === 'M') {
             $current = $current * 1024;
-            $units = "K";
+            $units = 'K';
         }
-        if ($units === "G") {
+        if ($units === 'G') {
             $current = $current * 1024 * 1024;
-            $units = "K";
+            $units = 'K';
         }
 
-        if ($units === "K") {
-            ini_set("memory_limit", ceil($current + $additionalKb) . "K");
+        if ($units === 'K') {
+            ini_set('memory_limit', ceil($current + $additionalKb) . 'K');
         }
     }
 

diff --git a/tests/TestCase/Error/ErrorHandlerTest.php b/tests/TestCase/Error/ErrorHandlerTest.php
@@ -433,4 +433,41 @@ public function testHandlePHP7Error()
         $errorHandler->handleException($error);
         $this->assertContains('Unexpected variable foo', $errorHandler->response->body(), 'message missing.');
     }
+
+    /**
+     * Data provider for memory limit changing.
+     *
+     * @return array
+     */
+    public function memoryLimitProvider()
+    {
+        return [
+            // start, adjust, expected
+            ['256M', 4, '262148K'],
+            ['262144K', 4, '262148K'],
+            ['1G', 128, '1048704K'],
+        ];
+    }
+
+    /**
+     * Test increasing the memory limit.
+     *
+     * @dataProvider memoryLimitProvider
+     * @return void
+     */
+    public function testIncreaseMemoryLimit($start, $adjust, $expected)
+    {
+        $initial = ini_get('memory_limit');
+        $this->skipIf(strlen($initial) === 0, 'Cannot read memory limit, and cannot test increasing it.');
+
+        // phpunit.xml often has -1 as memory limit
+        ini_set('memory_limit', $start);
+
+        $errorHandler = new TestErrorHandler();
+        $this->assertNull($errorHandler->increaseMemoryLimit($adjust));
+        $new = ini_get('memory_limit');
+        $this->assertEquals($expected, $new, 'memory limit did not get increased.');
+
+        ini_set('memory_limit', $initial);
+    }
 }