Merge branch '3.next' into dep-plugin-load

Author: markstory

Configure.php

@@ -260,18 +260,37 @@ public static function config($name, ConfigEngineInterface $engine)
     /**
      * Gets the names of the configured Engine objects.
      *
+     * Checking if a specific engine has been configured with this method is deprecated.
+     * Use Configure::isConfigured() instead.
+     *
      * @param string|null $name Engine name.
      * @return array|bool Array of the configured Engine objects, bool for specific name.
      */
     public static function configured($name = null)
     {
         if ($name !== null) {
+            deprecationWarning(
+                'Checking for a named engine with configured() is deprecated. ' .
+                'Use Configure::isConfigured() instead.'
+            );
+
             return isset(static::$_engines[$name]);
         }
 
         return array_keys(static::$_engines);
     }
 
+    /**
+     * Returns true if the Engine objects is configured.
+     *
+     * @param string $name Engine name.
+     * @return bool
+     */
+    public static function isConfigured($name)
+    {
+        return isset(static::$_engines[$name]);
+    }
+
     /**
      * Remove a configured engine. This will unset the engine
      * and make any future attempts to use it cause an Exception.

Configure/FileConfigTrait.php

@@ -60,8 +60,9 @@ protected function _getFilePath($key, $checkExists = false)
             return $file;
         }
 
-        if (is_file(realpath($file))) {
-            return realpath($file);
+        $realPath = realpath($file);
+        if ($realPath !== false && is_file($realPath)) {
+            return $realPath;
         }
 
         throw new Exception(sprintf('Could not load configuration file: %s', $file));

ConventionsTrait.php

@@ -135,7 +135,7 @@ protected function _pluralHumanName($name)
      */
     protected function _pluginPath($pluginName)
     {
-        if (Plugin::loaded($pluginName)) {
+        if (Plugin::isLoaded($pluginName)) {
             return Plugin::path($pluginName);
         }
 

Plugin.php

@@ -337,8 +337,22 @@ public static function routes($name = null)
     }
 
     /**
-     * Returns true if the plugin $plugin is already loaded
-     * If plugin is null, it will return a list of all loaded plugins
+     * Check whether or not a plugin is loaded.
+     *
+     * @param string $plugin The name of the plugin to check.
+     * @return bool
+     */
+    public static function isLoaded($plugin)
+    {
+        return static::getCollection()->has($plugin);
+    }
+
+    /**
+     * Return a list of loaded plugins.
+     *
+     * If a plugin name is provided, the return value will be a bool
+     * indicating whether or not the named plugin is loaded. This usage
+     * is deprecated. Instead you should use Plugin::isLoaded($name)
      *
      * @param string|null $plugin Plugin name.
      * @return bool|array Boolean true if $plugin is already loaded.
@@ -347,6 +361,11 @@ public static function routes($name = null)
     public static function loaded($plugin = null)
     {
         if ($plugin !== null) {
+            deprecationWarning(
+                'Checking a single plugin with Plugin::loaded() is deprecated. ' .
+                'Use Plugin::isLoaded() instead.'
+            );
+
             return static::getCollection()->has($plugin);
         }
         $names = [];