Upgrade: Update usage of app::path()

croogo · Sep 17, 2020 · 96a7f76 · 96a7f76
1 parent 75542b9
commit 96a7f76
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/Core/src/Controller/Component/CroogoComponent.php b/Core/src/Controller/Component/CroogoComponent.php
@@ -244,15 +244,15 @@ public function fieldToggle(Table $table, $id, $status, $field = 'status')
      */
     protected function _setupViewPaths(Controller $controller)
     {
-        $defaultViewPaths = App::path('Template');
+        $defaultViewPaths = App::path('templates');
         $pos = array_search(APP . 'Template' . DS, $defaultViewPaths);
         if ($pos !== false) {
             $viewPaths = array_splice($defaultViewPaths, 0, $pos + 1);
         } else {
             $viewPaths = $defaultViewPaths;
         }
         if ($controller->viewBuilder()->getTheme()) {
-            $themePaths = App::path('Template', $controller->viewBuilder()->getTheme());
+            $themePaths = App::path('templates', $controller->viewBuilder()->getTheme());
             foreach ($themePaths as $themePath) {
                 $viewPaths[] = $themePath;
                 if ($controller->getPlugin()) {
@@ -261,7 +261,7 @@ protected function _setupViewPaths(Controller $controller)
             }
         }
         if ($controller->getPlugin()) {
-            $viewPaths = array_merge($viewPaths, App::path('Template', $controller->getPlugin()));
+            $viewPaths = array_merge($viewPaths, App::path('templates', $controller->getPlugin()));
         }
         $viewPaths = array_merge($viewPaths, $defaultViewPaths);
 
@@ -285,7 +285,7 @@ public function viewFallback($templates)
         foreach ($templates as $template) {
             foreach ($templatePaths as $templatePath) {
                 $templatePath = $templatePath . $this->_viewPath() . DS . $template;
-                if (file_exists($templatePath . '.ctp')) {
+                if (file_exists($templatePath . '.php')) {
                     $controller->viewBuilder()->setTemplate($this->_viewPath() . DS . $template);
 
                     return;

diff --git a/Core/src/PluginManager.php b/Core/src/PluginManager.php
@@ -151,7 +151,7 @@ public function getPlugins($type = 'plugin')
         $plugins = [];
         $this->folder = new Folder;
         $registered = Configure::read('plugins');
-        $pluginPaths = Hash::merge(App::path('Plugin'), $registered);
+        $pluginPaths = Hash::merge(App::classPath('Plugin'), $registered);
         unset($pluginPaths['Croogo']); //Otherwise we get croogo plugins twice!
         foreach ($pluginPaths as $pluginName => $pluginPath) {
             $this->folder->path = $pluginPath;

diff --git a/Extensions/src/Controller/Admin/LocalesController.php b/Extensions/src/Controller/Admin/LocalesController.php
@@ -44,7 +44,7 @@ public function index()
 
         $locales = [];
         $folder = new Folder;
-        $paths = App::path('Locale');
+        $paths = App::path('locales');
         $currentLocale = I18n::getLocale();
         foreach ($paths as $path) {
             $folder->path = $path;