Merge branch 'staging' of https://github.com/the-kbA-team/cake2-app-t…

…emplate into staging
the-kbA-team · May 27, 2024 · 1e762bc · 1e762bc
2 parents 2bc67fb + 9884e25
commit 1e762bc
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 13 deletions.
diff --git a/Controller/AppController.php b/Controller/AppController.php
@@ -21,7 +21,6 @@
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
 App::uses('Controller', 'Controller');
-App::uses('CrudControllerTrait', 'Crud.Lib');
 
 /**
  * Application Controller
@@ -34,8 +33,6 @@
  */
 class AppController extends Controller {
 
-	use CrudControllerTrait;
-
 /**
  * List of global controller components
  *
@@ -44,13 +41,6 @@ class AppController extends Controller {
 	public $components = [
 		'RequestHandler',
 		'Session',
-		'Crud.Crud' => [
-			'listeners' => [
-				'Crud.Api',
-				'Crud.ApiPagination',
-				'Crud.ApiQueryLog'
-			]
-		],
 		'Paginator' => ['settings' => ['paramType' => 'querystring', 'limit' => 30]]
 	];
 

diff --git a/Dockerfile b/Dockerfile
@@ -53,6 +53,7 @@ WORKDIR /app
 # Copy the cake2 app template code to the working directory
 COPY . .
 
-# remove superfluous files
+# remove superfluous files & install composer dependencies
 RUN set -xe; \
-    rm -Rf .editorconfig .github .gitignore CHANGELOG.md Dockerfile README.md
+    rm -Rf .editorconfig .github .gitignore CHANGELOG.md Dockerfile README.md; \
+    composer install --no-interaction
diff --git a/composer.json b/composer.json
@@ -10,7 +10,6 @@
         "kba-team/cakephp": "^2.11",
         "josegonzalez/dotenv": "1.*",
         "ad7six/dsn": "0.3.*",
-        "friendsofcake/crud": "^3.1",
         "phpunit/phpunit": "^9.5"
     },
     "minimum-stability": "dev",