fixup! added Sonata generated administration with few basic functiona…

…lities
shopsys · May 23, 2024 · df89c52 · df89c52
1 parent d855c44
commit df89c52
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 11 deletions.
diff --git a/composer.json b/composer.json
@@ -268,7 +268,7 @@
         "patches": {
             "composer-exit-on-patch-failure": true,
             "twig/twig": {
-                "Hotfix for issue https://github.com/sonata-project/SonataAdminBundle/issues/8181": "packages/administration/src/Twig/sonata.patch"
+                "Hotfix for issue https://github.com/sonata-project/SonataAdminBundle/issues/8181": "project-base/app/src/Twig/sonata.patch"
             }
         }
     },

diff --git a/packages/administration/composer.json b/packages/administration/composer.json
@@ -39,13 +39,4 @@
             "cweagans/composer-patches": true
         }
     },
-    "extra": {
-        "enable-patching": true,
-        "patches": {
-            "composer-exit-on-patch-failure": true,
-            "twig/twig": {
-                "Hotfix for issue https://github.com/sonata-project/SonataAdminBundle/issues/8181": "packages/administration/src/Twig/sonata.patch"
-            }
-        }
-    }
 }
diff --git a/project-base/app/composer.json b/project-base/app/composer.json
@@ -197,6 +197,12 @@
             "require": "^5.4",
             "docker": false
         },
-        "enable-patching": true
+        "enable-patching": true,
+        "patches": {
+            "composer-exit-on-patch-failure": true,
+            "twig/twig": {
+                "Hotfix for issue https://github.com/sonata-project/SonataAdminBundle/issues/8181": "src/Twig/sonata.patch"
+            }
+        }
     }
 }
diff --git a/...ages/administration/src/Twig/sonata.patch → project-base/app/src/Twig/sonata.patch b/...ages/administration/src/Twig/sonata.patch → project-base/app/src/Twig/sonata.patch