From 377cd090625e9e12a8370c69b72cc52a50ecaa90 Mon Sep 17 00:00:00 2001 From: Val Bancer Date: Sun, 5 Aug 2018 15:32:12 +0200 Subject: [PATCH 1/2] Fix param documentation in App::import --- lib/Cake/Core/App.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/Cake/Core/App.php b/lib/Cake/Core/App.php index 8696a485a..26bfed996 100644 --- a/lib/Cake/Core/App.php +++ b/lib/Cake/Core/App.php @@ -152,7 +152,6 @@ class App { * * @var array */ - protected static $_packages = array(); /** * Holds the templates for each customizable package path in the application @@ -591,7 +590,7 @@ class App { * * @param string|array $type The type of Class if passed as a string, or all params can be passed as * a single array to $type. - * @param string $name Name of the Class or a unique name for the file + * @param string|array $name Name of the Class or a unique name for the file * @param bool|array $parent boolean true if Class Parent should be searched, accepts key => value * array('parent' => $parent, 'file' => $file, 'search' => $search, 'ext' => '$ext'); * $ext allows setting the extension of the file name From 494913648d8614b0f68d9a2c10647cac0e69acd8 Mon Sep 17 00:00:00 2001 From: Val Bancer Date: Sun, 5 Aug 2018 15:34:12 +0200 Subject: [PATCH 2/2] Restore property deleted by accident --- lib/Cake/Core/App.php | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/Cake/Core/App.php b/lib/Cake/Core/App.php index 26bfed996..409eb1b45 100644 --- a/lib/Cake/Core/App.php +++ b/lib/Cake/Core/App.php @@ -152,6 +152,7 @@ class App { * * @var array */ + protected static $_packages = array(); /** * Holds the templates for each customizable package path in the application