Merge branch 'master' into 3.next

markstory · markstory · commit 429a8851bc0f · 2018-07-29T22:04:34.000-04:00
diff --git a/PluginCollection.php b/PluginCollection.php
@@ -104,7 +104,7 @@ protected function loadConfig()
      *
      * @param string $name The plugin name to locate a path for. Will return '' when a plugin cannot be found.
      * @return string
-     * @throws Cake\Core\Exception\MissingPluginException when a plugin path cannot be resolved.
+     * @throws \Cake\Core\Exception\MissingPluginException when a plugin path cannot be resolved.
      * @internal
      */
     public function findPath($name)

Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ protected function loadConfig()`
`104`	`104`	`*`
`105`	`105`	`* @param string $name The plugin name to locate a path for. Will return '' when a plugin cannot be found.`
`106`	`106`	`* @return string`
`107`		`- * @throws Cake\Core\Exception\MissingPluginException when a plugin path cannot be resolved.`
	`107`	`+ * @throws \Cake\Core\Exception\MissingPluginException when a plugin path cannot be resolved.`
`108`	`108`	`* @internal`
`109`	`109`	`*/`
`110`	`110`	`public function findPath($name)`