From a489e3d3501749ea5046590190286a258049c7c2 Mon Sep 17 00:00:00 2001 From: Jeroen Thora Date: Sat, 23 Mar 2024 22:18:37 +0100 Subject: [PATCH] [Allbundles] Cleanup remaining deprecated code --- ...onyEnvironmentConfiguratorCompilerPass.php | 31 ------- .../AdminBundle/KunstmaanAdminBundle.php | 2 - .../Configurator/EnvironmentConfigurator.php | 25 ------ .../UndefinedSymfonyEncoreFunctionHandler.php | 27 ------ .../Controller/LegalController.php | 10 --- .../Command/GenerateDefaultSiteCommand.php | 12 --- .../Command/GenerateLayoutCommand.php | 7 +- .../Command/InstallCommand.php | 10 --- .../Generator/DefaultSiteGenerator.php | 8 +- .../Generator/LayoutGenerator.php | 86 ++++--------------- .../Resources/admin/admin-bundle-extra.js | 11 --- .../layout/Resources/admin/admin-style.scss | 3 - .../skeleton/layout/Resources/ui/js/app.js | 5 -- .../ui/scss/config/general/_paths.scss | 4 - .../config/vendors/_cookie-bundle-vars.scss | 4 - .../Resources/views/Layout/_css.html.twig | 4 - .../Resources/views/Layout/layout.html.twig | 8 -- .../AdminList/NodeAdminListConfigurator.php | 15 ---- 18 files changed, 18 insertions(+), 254 deletions(-) delete mode 100644 src/Kunstmaan/AdminBundle/DependencyInjection/Compiler/ReplaceSymfonyEnvironmentConfiguratorCompilerPass.php delete mode 100644 src/Kunstmaan/AdminBundle/Twig/Configurator/EnvironmentConfigurator.php delete mode 100644 src/Kunstmaan/AdminBundle/Twig/UndefinedSymfonyEncoreFunctionHandler.php diff --git a/src/Kunstmaan/AdminBundle/DependencyInjection/Compiler/ReplaceSymfonyEnvironmentConfiguratorCompilerPass.php b/src/Kunstmaan/AdminBundle/DependencyInjection/Compiler/ReplaceSymfonyEnvironmentConfiguratorCompilerPass.php deleted file mode 100644 index 2081be5da6..0000000000 --- a/src/Kunstmaan/AdminBundle/DependencyInjection/Compiler/ReplaceSymfonyEnvironmentConfiguratorCompilerPass.php +++ /dev/null @@ -1,31 +0,0 @@ -has('twig.configurator.environment')) { - return; - } - - $definitionCopy = clone $container->getDefinition('twig.configurator.environment'); - - $definitionCopy->setClass(EnvironmentConfigurator::class); - $container->setDefinition('kunstmaan_admin.twig.configurator.environment', $definitionCopy); - - $container->setAlias('twig.configurator.environment', 'kunstmaan_admin.twig.configurator.environment'); - } -} diff --git a/src/Kunstmaan/AdminBundle/KunstmaanAdminBundle.php b/src/Kunstmaan/AdminBundle/KunstmaanAdminBundle.php index 65df138156..5478020c93 100644 --- a/src/Kunstmaan/AdminBundle/KunstmaanAdminBundle.php +++ b/src/Kunstmaan/AdminBundle/KunstmaanAdminBundle.php @@ -7,7 +7,6 @@ use Kunstmaan\AdminBundle\DependencyInjection\Compiler\DataCollectorPass; use Kunstmaan\AdminBundle\DependencyInjection\Compiler\EnablePermissionsPass; use Kunstmaan\AdminBundle\DependencyInjection\Compiler\MenuCompilerPass; -use Kunstmaan\AdminBundle\DependencyInjection\Compiler\ReplaceSymfonyEnvironmentConfiguratorCompilerPass; use Kunstmaan\AdminBundle\DependencyInjection\KunstmaanAdminExtension; use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\HttpKernel\Bundle\Bundle; @@ -26,7 +25,6 @@ public function build(ContainerBuilder $container) $container->addCompilerPass(new AddLogProcessorsCompilerPass()); $container->addCompilerPass(new DataCollectorPass()); $container->addCompilerPass(new EnablePermissionsPass()); - $container->addCompilerPass(new ReplaceSymfonyEnvironmentConfiguratorCompilerPass()); $container->registerExtension(new KunstmaanAdminExtension()); } diff --git a/src/Kunstmaan/AdminBundle/Twig/Configurator/EnvironmentConfigurator.php b/src/Kunstmaan/AdminBundle/Twig/Configurator/EnvironmentConfigurator.php deleted file mode 100644 index 4467a254d1..0000000000 --- a/src/Kunstmaan/AdminBundle/Twig/Configurator/EnvironmentConfigurator.php +++ /dev/null @@ -1,25 +0,0 @@ -registerUndefinedFunctionCallback(function ($name) { return UndefinedSymfonyEncoreFunctionHandler::handle($name); }); - - parent::configure($environment); - } -} diff --git a/src/Kunstmaan/AdminBundle/Twig/UndefinedSymfonyEncoreFunctionHandler.php b/src/Kunstmaan/AdminBundle/Twig/UndefinedSymfonyEncoreFunctionHandler.php deleted file mode 100644 index 3c1c0b6ead..0000000000 --- a/src/Kunstmaan/AdminBundle/Twig/UndefinedSymfonyEncoreFunctionHandler.php +++ /dev/null @@ -1,27 +0,0 @@ -cookieHelper->isGrantedForCookieBundle($request)) { - throw $this->createNotFoundException(); - } - } } diff --git a/src/Kunstmaan/GeneratorBundle/Command/GenerateDefaultSiteCommand.php b/src/Kunstmaan/GeneratorBundle/Command/GenerateDefaultSiteCommand.php index 46a01674ad..38131a4de1 100644 --- a/src/Kunstmaan/GeneratorBundle/Command/GenerateDefaultSiteCommand.php +++ b/src/Kunstmaan/GeneratorBundle/Command/GenerateDefaultSiteCommand.php @@ -30,11 +30,6 @@ class GenerateDefaultSiteCommand extends KunstmaanGenerateCommand */ private $demosite; - /** - * @var bool - */ - private $groundcontrol; - /** @var DoctrineHelper */ private $doctrineHelper; @@ -65,7 +60,6 @@ protected function configure() ->addOption('namespace', '', InputOption::VALUE_OPTIONAL, 'The namespace to generate the default website in') ->addOption('prefix', '', InputOption::VALUE_OPTIONAL, 'The prefix to be used in the table names of the generated entities') ->addOption('demosite', '', InputOption::VALUE_NONE, 'Whether to generate a website with demo contents or a basic website') - ->addOption('groundcontrol', '', InputOption::VALUE_NONE, 'Whether to use Webpack Encore or Groundcontrol as FE build tools') ->addOption('browsersync', '', InputOption::VALUE_OPTIONAL, 'The URI that will be used for browsersync to connect') ->addOption('articleoverviewpageparent', '', InputOption::VALUE_OPTIONAL, 'Shortnames of the pages that can have the article overview page as a child (comma separated)') ->setName('kuma:generate:default-site'); @@ -99,18 +93,12 @@ protected function doExecute() $browserSyncUrl = $this->assistant->getOptionOrDefault('browsersync', null); - /* - * If we need to generate Groundcontrol or Webpack Encore - */ - $this->groundcontrol = $this->assistant->getOption('groundcontrol'); - // First we generate the layout if it is not yet generated $command = $this->getApplication()->find('kuma:generate:layout'); $arguments = [ 'command' => 'kuma:generate:layout', '--namespace' => str_replace('\\', '/', $this->bundle->getNamespace()), '--demosite' => $this->demosite, - '--groundcontrol' => $this->groundcontrol, '--browsersync' => $browserSyncUrl, '--subcommand' => true, ]; diff --git a/src/Kunstmaan/GeneratorBundle/Command/GenerateLayoutCommand.php b/src/Kunstmaan/GeneratorBundle/Command/GenerateLayoutCommand.php index e7c3a9b174..297c5f03d7 100644 --- a/src/Kunstmaan/GeneratorBundle/Command/GenerateLayoutCommand.php +++ b/src/Kunstmaan/GeneratorBundle/Command/GenerateLayoutCommand.php @@ -38,7 +38,6 @@ protected function configure() ->addOption('namespace', '', InputOption::VALUE_OPTIONAL, 'The namespace of the bundle where we need to create the layout in') ->addOption('subcommand', '', InputOption::VALUE_OPTIONAL, 'Whether the command is called from an other command or not') ->addOption('demosite', '', InputOption::VALUE_NONE, 'Pass this parameter when the demosite styles/javascipt should be generated') - ->addOption('groundcontrol', '', InputOption::VALUE_NONE, 'Pass this parameter to use Groundcontrol in favor of Webpack Encore') ->addOption('browsersync', '', InputOption::VALUE_OPTIONAL, 'The URI that will be used for browsersync to connect') ->setName('kuma:generate:layout'); } @@ -59,7 +58,7 @@ protected function doExecute() } $rootDir = $this->getApplication()->getKernel()->getProjectDir() . '/'; - $this->createGenerator()->generate($this->bundle, $rootDir, $this->assistant->getOption('demosite'), $this->browserSyncUrl, $this->assistant->getOption('groundcontrol')); + $this->createGenerator()->generate($this->bundle, $rootDir, $this->assistant->getOption('demosite'), $this->browserSyncUrl); if (!$this->isSubCommand()) { $this->assistant->writeSection('Layout successfully created', 'bg=green;fg=black'); @@ -80,10 +79,6 @@ protected function doInteract() $bundleNamespace = $this->assistant->getOptionOrDefault('namespace', null); $this->bundle = $this->askForBundleName('layout', $bundleNamespace); $this->browserSyncUrl = $this->assistant->getOptionOrDefault('browsersync', null); - - if (null === $this->browserSyncUrl && $this->assistant->getOption('groundcontrol', null)) { - $this->browserSyncUrl = $this->assistant->ask('Which URL would you like to configure for browserSync?', 'https://myproject.dev'); - } } /** diff --git a/src/Kunstmaan/GeneratorBundle/Command/InstallCommand.php b/src/Kunstmaan/GeneratorBundle/Command/InstallCommand.php index d7d5edf68c..2caf4a07fb 100644 --- a/src/Kunstmaan/GeneratorBundle/Command/InstallCommand.php +++ b/src/Kunstmaan/GeneratorBundle/Command/InstallCommand.php @@ -52,7 +52,6 @@ protected function configure() [ new InputOption('db-installed', '', InputOption::VALUE_NONE, 'Acknowledge that you have setup your database"'), new InputOption('demosite', '', InputOption::VALUE_REQUIRED, 'Do you want to create a "demosite"'), - new InputOption('groundcontrol', '', InputOption::VALUE_REQUIRED, 'Do you want to use Groundcontrol instead of Webpack Encore'), new InputOption('create-tests', '', InputOption::VALUE_REQUIRED, 'Do you want to create tests for you pages/pageparts'), new InputOption('namespace', '', InputOption::VALUE_OPTIONAL, 'The namespace of the bundle to create (only for SF3)'), new InputOption('dir', '', InputOption::VALUE_OPTIONAL, 'The directory where to create the bundle (only for SF3)'), @@ -98,11 +97,6 @@ protected function interact(InputInterface $input, OutputInterface $output) $input->setOption('demosite', $demoSiteOption === true ? 'Yes' : 'No'); } - if (null === $input->getOption('groundcontrol')) { - $groundcontrolOption = $this->assistant->askConfirmation('Do you want to use Groundcontrol instead of Webpack Encore? (y/n)', 'n', '?', false); - $input->setOption('groundcontrol', $groundcontrolOption === true ? 'Yes' : 'No'); - } - if (null === $input->getOption('create-tests')) { $createTests = $this->assistant->askConfirmation('Do you want to create tests for you pages/pageparts? (y/n)', 'n', '?', false); $input->setOption('create-tests', $createTests === true ? 'Yes' : 'No'); @@ -129,10 +123,6 @@ protected function execute(InputInterface $input, OutputInterface $output) $defaultSiteOptions['--demosite'] = true; } - if ($input->getOption('groundcontrol') === 'Yes') { - $defaultSiteOptions['--groundcontrol'] = true; - } - $this->executeCommand($output, 'kuma:generate:config'); $this diff --git a/src/Kunstmaan/GeneratorBundle/Generator/DefaultSiteGenerator.php b/src/Kunstmaan/GeneratorBundle/Generator/DefaultSiteGenerator.php index 703aac1f51..81660e883b 100644 --- a/src/Kunstmaan/GeneratorBundle/Generator/DefaultSiteGenerator.php +++ b/src/Kunstmaan/GeneratorBundle/Generator/DefaultSiteGenerator.php @@ -36,10 +36,6 @@ class DefaultSiteGenerator extends KunstmaanGenerator */ private $demosite; - /** - * @var bool - */ - private $groundControl; /** @var DoctrineHelper */ private $doctrineHelper; @@ -56,13 +52,12 @@ public function __construct(Filesystem $filesystem, ManagerRegistry $registry, $ * @param string $rootDir * @param bool $demosite */ - public function generate(BundleInterface $bundle, $prefix, $rootDir, $demosite = false, $groundControl = false) + public function generate(BundleInterface $bundle, $prefix, $rootDir, $demosite = false) { $this->bundle = $bundle; $this->prefix = GeneratorUtils::cleanPrefix($prefix); $this->rootDir = $rootDir; $this->demosite = $demosite; - $this->groundControl = $groundControl; $parameters = [ 'namespace' => $this->bundle->getNamespace(), @@ -71,7 +66,6 @@ public function generate(BundleInterface $bundle, $prefix, $rootDir, $demosite = 'prefix' => $this->prefix, 'demosite' => $this->demosite, 'multilanguage' => $this->isMultiLangEnvironment(), - 'groundcontrol' => $this->groundControl, 'canUseAttributes' => Kernel::VERSION_ID >= 50200, 'canUseEntityAttributes' => $this->doctrineHelper->doesClassUsesAttributes('App\\Entity\\Unkown' . uniqid()), ]; diff --git a/src/Kunstmaan/GeneratorBundle/Generator/LayoutGenerator.php b/src/Kunstmaan/GeneratorBundle/Generator/LayoutGenerator.php index 48fc246ed0..38ecab4815 100644 --- a/src/Kunstmaan/GeneratorBundle/Generator/LayoutGenerator.php +++ b/src/Kunstmaan/GeneratorBundle/Generator/LayoutGenerator.php @@ -34,72 +34,27 @@ class LayoutGenerator extends KunstmaanGenerator */ private $browserSyncUrl; - /** - * @var bool - */ - private $groundcontrol; - /** * Generate the basic layout. * * @param BundleInterface $bundle The bundle * @param string $rootDir The root directory of the application */ - public function generate(BundleInterface $bundle, $rootDir, $demosite, $browserSyncUrl, $groundcontrol) + public function generate(BundleInterface $bundle, $rootDir, $demosite, $browserSyncUrl) { $this->bundle = $bundle; $this->rootDir = $rootDir; $this->demosite = $demosite; $this->browserSyncUrl = $browserSyncUrl; - $this->groundcontrol = $groundcontrol; $this->shortBundleName = '@' . str_replace('Bundle', '', $bundle->getName()); $this->generateSharedConfigFiles(); - if ($groundcontrol) { - $this->generateGroundcontrolFiles(); - } else { - $this->generateWebpackEncoreFiles(); - } + $this->generateWebpackEncoreFiles(); $this->generateAssets(); $this->generateTemplate(); } - /** - * Generate the groundcontrol(gulp) configuration files. - */ - private function generateGroundcontrolFiles() - { - $this->renderFiles( - $this->skeletonDir . '/groundcontrol/bin/', - $this->rootDir . '/groundcontrol/', - ['bundle' => $this->bundle, 'demosite' => $this->demosite, 'browserSyncUrl' => $this->browserSyncUrl], - true - ); - $this->renderSingleFile( - $this->skeletonDir . '/groundcontrol/', - $this->rootDir, - 'gulpfile.babel.js', - ['bundle' => $this->bundle, 'demosite' => $this->demosite], - true - ); - $this->renderSingleFile( - $this->skeletonDir . '/groundcontrol/', - $this->rootDir, - '.babelrc', - [], - true - ); - $this->renderSingleFile( - $this->skeletonDir . '/groundcontrol/', - $this->rootDir, - 'package.json', - ['bundle' => $this->bundle, 'demosite' => $this->demosite], - true - ); - $this->assistant->writeLine('Generating groundcontrol configuration : OK'); - } - /** * Generate the Webpack Encore configuration files. */ @@ -130,7 +85,7 @@ private function generateWebpackEncoreFiles() } /** - * Generate shared (groundcontrol & webpack encore) configuration files. + * Generate shared webpack encore configuration files. */ private function generateSharedConfigFiles() { @@ -178,28 +133,26 @@ private function generateAssets() { $sourceDir = $this->skeletonDir; - if (!$this->groundcontrol) { - $this->removeDirectory($this->getAssetsDir($this->bundle)); - } + $this->removeDirectory($this->getAssetsDir($this->bundle)); $relPath = '/Resources/ui/'; $this->copyFiles($sourceDir . $relPath, $this->getAssetsDir($this->bundle) . '/ui', true); $this->renderFiles( $sourceDir . $relPath . '/js/', $this->getAssetsDir($this->bundle) . '/ui/js/', - ['bundle' => $this->bundle, 'demosite' => $this->demosite, 'groundcontrol' => $this->groundcontrol], + ['bundle' => $this->bundle, 'demosite' => $this->demosite], true ); $this->renderFiles( $sourceDir . $relPath . '/scss/', $this->getAssetsDir($this->bundle) . '/ui/scss/', - ['bundle' => $this->bundle, 'demosite' => $this->demosite, 'groundcontrol' => $this->groundcontrol], + ['bundle' => $this->bundle, 'demosite' => $this->demosite], true ); $this->renderFiles( $sourceDir . '/Resources/admin/', $this->getAssetsDir($this->bundle) . '/admin/', - ['bundle' => $this->bundle, 'demosite' => $this->demosite, 'groundcontrol' => $this->groundcontrol], + ['bundle' => $this->bundle, 'demosite' => $this->demosite], true ); @@ -268,16 +221,14 @@ private function generateAssets() $this->removeDirectory($this->getAssetsDir($this->bundle) . '/ui/scss/helpers/mixins/'); } - if (!$this->groundcontrol) { - $this->renderSingleFile( - $sourceDir . $relPath . 'js/', - $this->getAssetsDir($this->bundle) . '/ui/', - 'app.js', - ['demosite' => $this->demosite, 'groundcontrol' => $this->groundcontrol], - true - ); - $this->removeFile($this->getAssetsDir($this->bundle) . '/ui/js/app.js'); - } + $this->renderSingleFile( + $sourceDir . $relPath . 'js/', + $this->getAssetsDir($this->bundle) . '/ui/', + 'app.js', + ['demosite' => $this->demosite], + true + ); + $this->removeFile($this->getAssetsDir($this->bundle) . '/ui/js/app.js'); $this->assistant->writeLine('Generating ui assets : OK'); } @@ -295,7 +246,6 @@ private function generateTemplate() 'bundle' => $this->bundle, 'demosite' => $this->demosite, 'shortBundleName' => $this->shortBundleName, - 'groundcontrol' => $this->groundcontrol, ], true ); @@ -306,11 +256,7 @@ private function generateTemplate() $this->removeFile($this->getTemplateDir($this->bundle) . '/Layout/_demositemessage.html.twig'); } - if ($this->groundcontrol) { - $this->removeFile($this->getTemplateDir($this->bundle) . '/Layout/_js.html.twig'); - } else { - $this->removeFile($this->getTemplateDir($this->bundle) . '/Layout/_js_footer.html.twig'); - } + $this->removeFile($this->getTemplateDir($this->bundle) . '/Layout/_js_footer.html.twig'); $this->assistant->writeLine('Generating template files : OK'); } diff --git a/src/Kunstmaan/GeneratorBundle/Resources/SensioGeneratorBundle/skeleton/layout/Resources/admin/admin-bundle-extra.js b/src/Kunstmaan/GeneratorBundle/Resources/SensioGeneratorBundle/skeleton/layout/Resources/admin/admin-bundle-extra.js index ee9d9a2982..da8e12084c 100644 --- a/src/Kunstmaan/GeneratorBundle/Resources/SensioGeneratorBundle/skeleton/layout/Resources/admin/admin-bundle-extra.js +++ b/src/Kunstmaan/GeneratorBundle/Resources/SensioGeneratorBundle/skeleton/layout/Resources/admin/admin-bundle-extra.js @@ -1,13 +1,3 @@ -{% if groundcontrol %} -/** - * - * Extra Javascript that needs to be implemented for the KunstmaanBundlesCMS can be written in this file/folder. - * - * The Javascript will be bundled & compiled when the `npm run build` command has run. The compiled JS will be at: - * public/build/js/admin-bundle-extra.js and will be included automatically in all of the KunstmaanBundlesCMS layouts. - * - */ -{% else %} {% if not demosite %} /* global $:readonly */ {% endif %} @@ -23,4 +13,3 @@ document.onreadystatechange = () => { function initExtraAdminJs() { console.log($); } -{% endif %} diff --git a/src/Kunstmaan/GeneratorBundle/Resources/SensioGeneratorBundle/skeleton/layout/Resources/admin/admin-style.scss b/src/Kunstmaan/GeneratorBundle/Resources/SensioGeneratorBundle/skeleton/layout/Resources/admin/admin-style.scss index 2c4f175d07..66c8eabcd1 100644 --- a/src/Kunstmaan/GeneratorBundle/Resources/SensioGeneratorBundle/skeleton/layout/Resources/admin/admin-style.scss +++ b/src/Kunstmaan/GeneratorBundle/Resources/SensioGeneratorBundle/skeleton/layout/Resources/admin/admin-style.scss @@ -1,7 +1,4 @@ -{% set pathPrefix = '../ui/scss/' %} -{% if not groundcontrol -%} {% set pathPrefix = '~scssRootDir/' %} -{% endif %} @charset "UTF-8"; /* ========================================================================== diff --git a/src/Kunstmaan/GeneratorBundle/Resources/SensioGeneratorBundle/skeleton/layout/Resources/ui/js/app.js b/src/Kunstmaan/GeneratorBundle/Resources/SensioGeneratorBundle/skeleton/layout/Resources/ui/js/app.js index 8a8d4182ee..e7ca2af3c0 100644 --- a/src/Kunstmaan/GeneratorBundle/Resources/SensioGeneratorBundle/skeleton/layout/Resources/ui/js/app.js +++ b/src/Kunstmaan/GeneratorBundle/Resources/SensioGeneratorBundle/skeleton/layout/Resources/ui/js/app.js @@ -1,7 +1,4 @@ -{% set pathPrefix = './' %} -{% if not groundcontrol -%} {% set pathPrefix = './js/' %} -{% endif %} import 'picturefill'; {% if demosite %} import 'velocity-animate'; @@ -11,10 +8,8 @@ import cbSidebarToggle from 'cargobay/src/sidebar-toggle/js/jquery.sidebar-toggl import cbToggle from 'cargobay/src/toggle/js/jquery.toggle'; {% endif %} -{% if not groundcontrol %} import './scss/style.scss'; -{% endif %} {% if demosite %} import search from '{{ pathPrefix }}search'; import demoMsg from '{{ pathPrefix }}demoMsg'; diff --git a/src/Kunstmaan/GeneratorBundle/Resources/SensioGeneratorBundle/skeleton/layout/Resources/ui/scss/config/general/_paths.scss b/src/Kunstmaan/GeneratorBundle/Resources/SensioGeneratorBundle/skeleton/layout/Resources/ui/scss/config/general/_paths.scss index 0042d8c987..12dcf08f92 100644 --- a/src/Kunstmaan/GeneratorBundle/Resources/SensioGeneratorBundle/skeleton/layout/Resources/ui/scss/config/general/_paths.scss +++ b/src/Kunstmaan/GeneratorBundle/Resources/SensioGeneratorBundle/skeleton/layout/Resources/ui/scss/config/general/_paths.scss @@ -24,10 +24,6 @@ $general: "#{$root}/img/general"; {% if demosite %} /* Font folders ========================================================================== */ -{% if not groundcontrol %} $iconfont-path: "~scssRootDir/../fonts/iconfont/fonts"; -{% else %} -$iconfont-path: "#{$root}/fonts/iconfont/fonts"; -{% endif %} $webfont-path: "#{$root}/fonts/webfont/fonts"; {% endif %} diff --git a/src/Kunstmaan/GeneratorBundle/Resources/SensioGeneratorBundle/skeleton/layout/Resources/ui/scss/config/vendors/_cookie-bundle-vars.scss b/src/Kunstmaan/GeneratorBundle/Resources/SensioGeneratorBundle/skeleton/layout/Resources/ui/scss/config/vendors/_cookie-bundle-vars.scss index 8f31a7cbc7..9aef1f24dc 100644 --- a/src/Kunstmaan/GeneratorBundle/Resources/SensioGeneratorBundle/skeleton/layout/Resources/ui/scss/config/vendors/_cookie-bundle-vars.scss +++ b/src/Kunstmaan/GeneratorBundle/Resources/SensioGeneratorBundle/skeleton/layout/Resources/ui/scss/config/vendors/_cookie-bundle-vars.scss @@ -5,8 +5,4 @@ Never add styles directly to this file ========================================================================== */ -{% if groundcontrol %} -$base-image-path: "../../build/img/legal/svg/"; -{% else %} $base-image-path: "~scssRootDir/../img/legal/svg/"; -{% endif %} diff --git a/src/Kunstmaan/GeneratorBundle/Resources/SensioGeneratorBundle/skeleton/layout/Resources/views/Layout/_css.html.twig b/src/Kunstmaan/GeneratorBundle/Resources/SensioGeneratorBundle/skeleton/layout/Resources/views/Layout/_css.html.twig index cf869f7bbc..1fb3300cfe 100644 --- a/src/Kunstmaan/GeneratorBundle/Resources/SensioGeneratorBundle/skeleton/layout/Resources/views/Layout/_css.html.twig +++ b/src/Kunstmaan/GeneratorBundle/Resources/SensioGeneratorBundle/skeleton/layout/Resources/views/Layout/_css.html.twig @@ -1,7 +1,3 @@ {% block css %} -<% if not groundcontrol %> {{ encore_entry_link_tags('app') }} -<% else %> - -<% endif %> {% endblock %} diff --git a/src/Kunstmaan/GeneratorBundle/Resources/SensioGeneratorBundle/skeleton/layout/Resources/views/Layout/layout.html.twig b/src/Kunstmaan/GeneratorBundle/Resources/SensioGeneratorBundle/skeleton/layout/Resources/views/Layout/layout.html.twig index 5e8954f41d..984e8da3f9 100755 --- a/src/Kunstmaan/GeneratorBundle/Resources/SensioGeneratorBundle/skeleton/layout/Resources/views/Layout/layout.html.twig +++ b/src/Kunstmaan/GeneratorBundle/Resources/SensioGeneratorBundle/skeleton/layout/Resources/views/Layout/layout.html.twig @@ -38,11 +38,9 @@ {# CSS #} {% include 'Layout/_css.html.twig' %} -<% if not groundcontrol %> {# JS #} {% include 'Layout/_js.html.twig' %} -<% endif %> {% endapply %} @@ -94,12 +92,6 @@ {% include 'Layout/_cookieconsent.html.twig' %} {% endblock %} -<% if groundcontrol %> - {# JS Footer #} - {% block jsBundle %} - {% include 'Layout/_js_footer.html.twig' %} - {% endblock %} -<% endif %> <% if demosite %> diff --git a/src/Kunstmaan/NodeBundle/AdminList/NodeAdminListConfigurator.php b/src/Kunstmaan/NodeBundle/AdminList/NodeAdminListConfigurator.php index 01709677f1..b21bc5253f 100644 --- a/src/Kunstmaan/NodeBundle/AdminList/NodeAdminListConfigurator.php +++ b/src/Kunstmaan/NodeBundle/AdminList/NodeAdminListConfigurator.php @@ -239,21 +239,6 @@ public function getPathByConvention($suffix = null) return sprintf('KunstmaanNodeBundle_nodes_%s', $suffix); } - /** - * @deprecated since 6.4. There is no replacement for this method. - * - * Override controller path (because actions for different entities are - * defined in a single Settings controller). - * - * @return string - */ - public function getControllerPath() - { - trigger_deprecation('kunstmaan/node-bundle', '6.4', 'Method deprecated and will be removed in 7.0. There is no replacement for this method.'); - - return 'KunstmaanNodeBundle:NodeAdmin'; - } - /** * @param QueryBuilder $queryBuilder The query builder */