From efbbadf243a4138b371de6afb7cf97f32764238b Mon Sep 17 00:00:00 2001 From: Mikhail Strachuk Date: Thu, 1 Jun 2017 08:47:55 -0700 Subject: [PATCH 1/6] to match symfony-standard autoload path --- app/autoload.php | 20 -------------------- bin/console | 5 +++-- web/app.php | 2 +- web/app_dev.php | 2 +- 4 files changed, 5 insertions(+), 24 deletions(-) delete mode 100644 app/autoload.php diff --git a/app/autoload.php b/app/autoload.php deleted file mode 100644 index 830bd0769..000000000 --- a/app/autoload.php +++ /dev/null @@ -1,20 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -use Composer\Autoload\ClassLoader; -use Doctrine\Common\Annotations\AnnotationRegistry; - -/** @var ClassLoader $loader */ -$loader = require __DIR__.'/../vendor/autoload.php'; - -AnnotationRegistry::registerLoader([$loader, 'loadClass']); - -return $loader; diff --git a/bin/console b/bin/console index 2277c4f1f..3c3575651 100755 --- a/bin/console +++ b/bin/console @@ -6,7 +6,8 @@ use Symfony\Component\Console\Input\ArgvInput; use Symfony\Component\Debug\Debug; // if you don't want to setup permissions the proper way, just uncomment the following PHP line -// read https://symfony.com/doc/current/book/installation.html#configuration-and-setup for more information +// read https://symfony.com/doc/current/setup.html#checking-symfony-application-configuration-and-setup +// for more information //umask(0000); set_time_limit(0); @@ -14,7 +15,7 @@ set_time_limit(0); /** * @var Composer\Autoload\ClassLoader $loader */ -$loader = require __DIR__.'/../app/autoload.php'; +$loader = require __DIR__.'/../vendor/autoload.php'; $input = new ArgvInput(); $env = $input->getParameterOption(['--env', '-e'], getenv('SYMFONY_ENV') ?: 'dev'); diff --git a/web/app.php b/web/app.php index a478f3e02..8ff32fb42 100644 --- a/web/app.php +++ b/web/app.php @@ -19,7 +19,7 @@ /** * @var Composer\Autoload\ClassLoader */ -$loader = require __DIR__.'/../app/autoload.php'; +$loader = require __DIR__.'/../vendor/autoload.php'; if (PHP_VERSION_ID < 70000) { include_once __DIR__.'/../var/bootstrap.php.cache'; } diff --git a/web/app_dev.php b/web/app_dev.php index 60a09d9c5..a26c0ec4a 100644 --- a/web/app_dev.php +++ b/web/app_dev.php @@ -34,7 +34,7 @@ } /** @var Composer\Autoload\ClassLoader $loader */ -$loader = require __DIR__.'/../app/autoload.php'; +$loader = require __DIR__.'/../vendor/autoload.php'; Debug::enable(); $kernel = new AppKernel('dev', true); From 3098970fb18dbbf8167f48757f5c4fc2a5bda350 Mon Sep 17 00:00:00 2001 From: mstrom Date: Thu, 1 Jun 2017 09:08:25 -0700 Subject: [PATCH 2/6] Update phpunit.xml.dist --- phpunit.xml.dist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 04d542ede..6ad09f7f2 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -5,7 +5,7 @@ xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.8/phpunit.xsd" backupGlobals="false" colors="true" - bootstrap="app/autoload.php" + bootstrap="vendor/autoload.php" > From 820d3acd390a1f41185e15cd38d7b4d4e29df3e8 Mon Sep 17 00:00:00 2001 From: Mikhail Strachuk Date: Sun, 2 Jul 2017 10:24:58 -0700 Subject: [PATCH 3/6] Move templates folder to root --- app/config/config.yml | 2 +- {app/Resources/translations => translations}/messages.ca.xlf | 0 {app/Resources/translations => translations}/messages.cs.xlf | 0 {app/Resources/translations => translations}/messages.de.xlf | 0 {app/Resources/translations => translations}/messages.en.xlf | 0 {app/Resources/translations => translations}/messages.es.xlf | 0 {app/Resources/translations => translations}/messages.fr.xlf | 0 {app/Resources/translations => translations}/messages.hr.xlf | 0 {app/Resources/translations => translations}/messages.id.xlf | 0 {app/Resources/translations => translations}/messages.it.xlf | 0 {app/Resources/translations => translations}/messages.ja.xlf | 0 {app/Resources/translations => translations}/messages.nl.xlf | 0 {app/Resources/translations => translations}/messages.pl.xlf | 0 {app/Resources/translations => translations}/messages.pt_BR.xlf | 0 {app/Resources/translations => translations}/messages.ro.xlf | 0 {app/Resources/translations => translations}/messages.ru.xlf | 0 {app/Resources/translations => translations}/messages.sl.xlf | 0 {app/Resources/translations => translations}/messages.uk.xlf | 0 {app/Resources/translations => translations}/messages.zh_CN.xlf | 0 {app/Resources/translations => translations}/validators.ca.xlf | 0 {app/Resources/translations => translations}/validators.cs.xlf | 0 {app/Resources/translations => translations}/validators.de.xlf | 0 {app/Resources/translations => translations}/validators.en.xlf | 0 {app/Resources/translations => translations}/validators.es.xlf | 0 {app/Resources/translations => translations}/validators.fr.xlf | 0 {app/Resources/translations => translations}/validators.hr.xlf | 0 {app/Resources/translations => translations}/validators.id.xlf | 0 {app/Resources/translations => translations}/validators.it.xlf | 0 {app/Resources/translations => translations}/validators.ja.xlf | 0 {app/Resources/translations => translations}/validators.nl.xlf | 0 {app/Resources/translations => translations}/validators.pl.xlf | 0 .../translations => translations}/validators.pt_BR.xlf | 0 {app/Resources/translations => translations}/validators.ro.xlf | 0 {app/Resources/translations => translations}/validators.ru.xlf | 0 {app/Resources/translations => translations}/validators.sl.xlf | 0 {app/Resources/translations => translations}/validators.uk.xlf | 0 .../translations => translations}/validators.zh_CN.xlf | 0 37 files changed, 1 insertion(+), 1 deletion(-) rename {app/Resources/translations => translations}/messages.ca.xlf (100%) rename {app/Resources/translations => translations}/messages.cs.xlf (100%) rename {app/Resources/translations => translations}/messages.de.xlf (100%) rename {app/Resources/translations => translations}/messages.en.xlf (100%) rename {app/Resources/translations => translations}/messages.es.xlf (100%) rename {app/Resources/translations => translations}/messages.fr.xlf (100%) rename {app/Resources/translations => translations}/messages.hr.xlf (100%) rename {app/Resources/translations => translations}/messages.id.xlf (100%) rename {app/Resources/translations => translations}/messages.it.xlf (100%) rename {app/Resources/translations => translations}/messages.ja.xlf (100%) rename {app/Resources/translations => translations}/messages.nl.xlf (100%) rename {app/Resources/translations => translations}/messages.pl.xlf (100%) rename {app/Resources/translations => translations}/messages.pt_BR.xlf (100%) rename {app/Resources/translations => translations}/messages.ro.xlf (100%) rename {app/Resources/translations => translations}/messages.ru.xlf (100%) rename {app/Resources/translations => translations}/messages.sl.xlf (100%) rename {app/Resources/translations => translations}/messages.uk.xlf (100%) rename {app/Resources/translations => translations}/messages.zh_CN.xlf (100%) rename {app/Resources/translations => translations}/validators.ca.xlf (100%) rename {app/Resources/translations => translations}/validators.cs.xlf (100%) rename {app/Resources/translations => translations}/validators.de.xlf (100%) rename {app/Resources/translations => translations}/validators.en.xlf (100%) rename {app/Resources/translations => translations}/validators.es.xlf (100%) rename {app/Resources/translations => translations}/validators.fr.xlf (100%) rename {app/Resources/translations => translations}/validators.hr.xlf (100%) rename {app/Resources/translations => translations}/validators.id.xlf (100%) rename {app/Resources/translations => translations}/validators.it.xlf (100%) rename {app/Resources/translations => translations}/validators.ja.xlf (100%) rename {app/Resources/translations => translations}/validators.nl.xlf (100%) rename {app/Resources/translations => translations}/validators.pl.xlf (100%) rename {app/Resources/translations => translations}/validators.pt_BR.xlf (100%) rename {app/Resources/translations => translations}/validators.ro.xlf (100%) rename {app/Resources/translations => translations}/validators.ru.xlf (100%) rename {app/Resources/translations => translations}/validators.sl.xlf (100%) rename {app/Resources/translations => translations}/validators.uk.xlf (100%) rename {app/Resources/translations => translations}/validators.zh_CN.xlf (100%) diff --git a/app/config/config.yml b/app/config/config.yml index a8a05527f..d26255e04 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -30,7 +30,7 @@ framework: # and with different cache configurations for each fragment # https://symfony.com/doc/current/book/http_cache.html#edge-side-includes esi: { enabled: true } - translator: { fallback: '%locale%' } + translator: { fallback: '%locale%', paths: ["%kernel.project_dir%/translations"] } secret: '%env(SYMFONY_SECRET)%' router: resource: '%kernel.project_dir%/app/config/routing.yml' diff --git a/app/Resources/translations/messages.ca.xlf b/translations/messages.ca.xlf similarity index 100% rename from app/Resources/translations/messages.ca.xlf rename to translations/messages.ca.xlf diff --git a/app/Resources/translations/messages.cs.xlf b/translations/messages.cs.xlf similarity index 100% rename from app/Resources/translations/messages.cs.xlf rename to translations/messages.cs.xlf diff --git a/app/Resources/translations/messages.de.xlf b/translations/messages.de.xlf similarity index 100% rename from app/Resources/translations/messages.de.xlf rename to translations/messages.de.xlf diff --git a/app/Resources/translations/messages.en.xlf b/translations/messages.en.xlf similarity index 100% rename from app/Resources/translations/messages.en.xlf rename to translations/messages.en.xlf diff --git a/app/Resources/translations/messages.es.xlf b/translations/messages.es.xlf similarity index 100% rename from app/Resources/translations/messages.es.xlf rename to translations/messages.es.xlf diff --git a/app/Resources/translations/messages.fr.xlf b/translations/messages.fr.xlf similarity index 100% rename from app/Resources/translations/messages.fr.xlf rename to translations/messages.fr.xlf diff --git a/app/Resources/translations/messages.hr.xlf b/translations/messages.hr.xlf similarity index 100% rename from app/Resources/translations/messages.hr.xlf rename to translations/messages.hr.xlf diff --git a/app/Resources/translations/messages.id.xlf b/translations/messages.id.xlf similarity index 100% rename from app/Resources/translations/messages.id.xlf rename to translations/messages.id.xlf diff --git a/app/Resources/translations/messages.it.xlf b/translations/messages.it.xlf similarity index 100% rename from app/Resources/translations/messages.it.xlf rename to translations/messages.it.xlf diff --git a/app/Resources/translations/messages.ja.xlf b/translations/messages.ja.xlf similarity index 100% rename from app/Resources/translations/messages.ja.xlf rename to translations/messages.ja.xlf diff --git a/app/Resources/translations/messages.nl.xlf b/translations/messages.nl.xlf similarity index 100% rename from app/Resources/translations/messages.nl.xlf rename to translations/messages.nl.xlf diff --git a/app/Resources/translations/messages.pl.xlf b/translations/messages.pl.xlf similarity index 100% rename from app/Resources/translations/messages.pl.xlf rename to translations/messages.pl.xlf diff --git a/app/Resources/translations/messages.pt_BR.xlf b/translations/messages.pt_BR.xlf similarity index 100% rename from app/Resources/translations/messages.pt_BR.xlf rename to translations/messages.pt_BR.xlf diff --git a/app/Resources/translations/messages.ro.xlf b/translations/messages.ro.xlf similarity index 100% rename from app/Resources/translations/messages.ro.xlf rename to translations/messages.ro.xlf diff --git a/app/Resources/translations/messages.ru.xlf b/translations/messages.ru.xlf similarity index 100% rename from app/Resources/translations/messages.ru.xlf rename to translations/messages.ru.xlf diff --git a/app/Resources/translations/messages.sl.xlf b/translations/messages.sl.xlf similarity index 100% rename from app/Resources/translations/messages.sl.xlf rename to translations/messages.sl.xlf diff --git a/app/Resources/translations/messages.uk.xlf b/translations/messages.uk.xlf similarity index 100% rename from app/Resources/translations/messages.uk.xlf rename to translations/messages.uk.xlf diff --git a/app/Resources/translations/messages.zh_CN.xlf b/translations/messages.zh_CN.xlf similarity index 100% rename from app/Resources/translations/messages.zh_CN.xlf rename to translations/messages.zh_CN.xlf diff --git a/app/Resources/translations/validators.ca.xlf b/translations/validators.ca.xlf similarity index 100% rename from app/Resources/translations/validators.ca.xlf rename to translations/validators.ca.xlf diff --git a/app/Resources/translations/validators.cs.xlf b/translations/validators.cs.xlf similarity index 100% rename from app/Resources/translations/validators.cs.xlf rename to translations/validators.cs.xlf diff --git a/app/Resources/translations/validators.de.xlf b/translations/validators.de.xlf similarity index 100% rename from app/Resources/translations/validators.de.xlf rename to translations/validators.de.xlf diff --git a/app/Resources/translations/validators.en.xlf b/translations/validators.en.xlf similarity index 100% rename from app/Resources/translations/validators.en.xlf rename to translations/validators.en.xlf diff --git a/app/Resources/translations/validators.es.xlf b/translations/validators.es.xlf similarity index 100% rename from app/Resources/translations/validators.es.xlf rename to translations/validators.es.xlf diff --git a/app/Resources/translations/validators.fr.xlf b/translations/validators.fr.xlf similarity index 100% rename from app/Resources/translations/validators.fr.xlf rename to translations/validators.fr.xlf diff --git a/app/Resources/translations/validators.hr.xlf b/translations/validators.hr.xlf similarity index 100% rename from app/Resources/translations/validators.hr.xlf rename to translations/validators.hr.xlf diff --git a/app/Resources/translations/validators.id.xlf b/translations/validators.id.xlf similarity index 100% rename from app/Resources/translations/validators.id.xlf rename to translations/validators.id.xlf diff --git a/app/Resources/translations/validators.it.xlf b/translations/validators.it.xlf similarity index 100% rename from app/Resources/translations/validators.it.xlf rename to translations/validators.it.xlf diff --git a/app/Resources/translations/validators.ja.xlf b/translations/validators.ja.xlf similarity index 100% rename from app/Resources/translations/validators.ja.xlf rename to translations/validators.ja.xlf diff --git a/app/Resources/translations/validators.nl.xlf b/translations/validators.nl.xlf similarity index 100% rename from app/Resources/translations/validators.nl.xlf rename to translations/validators.nl.xlf diff --git a/app/Resources/translations/validators.pl.xlf b/translations/validators.pl.xlf similarity index 100% rename from app/Resources/translations/validators.pl.xlf rename to translations/validators.pl.xlf diff --git a/app/Resources/translations/validators.pt_BR.xlf b/translations/validators.pt_BR.xlf similarity index 100% rename from app/Resources/translations/validators.pt_BR.xlf rename to translations/validators.pt_BR.xlf diff --git a/app/Resources/translations/validators.ro.xlf b/translations/validators.ro.xlf similarity index 100% rename from app/Resources/translations/validators.ro.xlf rename to translations/validators.ro.xlf diff --git a/app/Resources/translations/validators.ru.xlf b/translations/validators.ru.xlf similarity index 100% rename from app/Resources/translations/validators.ru.xlf rename to translations/validators.ru.xlf diff --git a/app/Resources/translations/validators.sl.xlf b/translations/validators.sl.xlf similarity index 100% rename from app/Resources/translations/validators.sl.xlf rename to translations/validators.sl.xlf diff --git a/app/Resources/translations/validators.uk.xlf b/translations/validators.uk.xlf similarity index 100% rename from app/Resources/translations/validators.uk.xlf rename to translations/validators.uk.xlf diff --git a/app/Resources/translations/validators.zh_CN.xlf b/translations/validators.zh_CN.xlf similarity index 100% rename from app/Resources/translations/validators.zh_CN.xlf rename to translations/validators.zh_CN.xlf From d74f4e2936315f77fda42addf5ad3ef06956c549 Mon Sep 17 00:00:00 2001 From: Mikhail Strachuk Date: Sun, 2 Jul 2017 10:25:30 -0700 Subject: [PATCH 4/6] Move templates folder to root --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b75e460b6..bce9d32f4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,6 +30,6 @@ script: # this checks that the Twig template files contain no syntax errors - ./bin/console lint:twig app/Resources @CodeExplorerBundle # this checks that the XLIFF translations contain no syntax errors - - ./bin/console lint:xliff app/Resources + - ./bin/console lint:xliff translations # this checks that the application doesn't use dependencies with known security vulnerabilities - ./bin/console security:check --end-point=http://security.sensiolabs.org/check_lock From 08db4d3f2f7c91c227f87d534fe73e9b2a8b5bc0 Mon Sep 17 00:00:00 2001 From: Mikhail Strachuk Date: Sun, 2 Jul 2017 10:32:22 -0700 Subject: [PATCH 5/6] Move templates folder to root --- .travis.yml | 2 +- app/config/config.yml | 3 +++ .../views => templates/TwigBundle}/Exception/error.html.twig | 0 .../TwigBundle}/Exception/error403.html.twig | 0 .../TwigBundle}/Exception/error404.html.twig | 0 .../TwigBundle}/Exception/error500.html.twig | 0 .../views => templates}/admin/blog/_delete_form.html.twig | 0 {app/Resources/views => templates}/admin/blog/_form.html.twig | 0 {app/Resources/views => templates}/admin/blog/edit.html.twig | 0 {app/Resources/views => templates}/admin/blog/index.html.twig | 0 {app/Resources/views => templates}/admin/blog/new.html.twig | 0 {app/Resources/views => templates}/admin/blog/show.html.twig | 0 {app/Resources/views => templates}/admin/layout.html.twig | 0 {app/Resources/views => templates}/base.html.twig | 0 .../Resources/views => templates}/blog/_comment_form.html.twig | 0 .../blog/_delete_post_confirmation.html.twig | 0 {app/Resources/views => templates}/blog/_post_tags.html.twig | 0 {app/Resources/views => templates}/blog/_rss.html.twig | 0 {app/Resources/views => templates}/blog/about.html.twig | 0 .../views => templates}/blog/comment_form_error.html.twig | 0 {app/Resources/views => templates}/blog/index.html.twig | 0 {app/Resources/views => templates}/blog/index.xml.twig | 0 {app/Resources/views => templates}/blog/post_show.html.twig | 0 .../views => templates}/default/_flash_messages.html.twig | 0 {app/Resources/views => templates}/default/homepage.html.twig | 0 {app/Resources/views => templates}/form/fields.html.twig | 0 {app/Resources/views => templates}/form/layout.html.twig | 0 {app/Resources/views => templates}/security/login.html.twig | 0 28 files changed, 4 insertions(+), 1 deletion(-) rename {app/Resources/TwigBundle/views => templates/TwigBundle}/Exception/error.html.twig (100%) rename {app/Resources/TwigBundle/views => templates/TwigBundle}/Exception/error403.html.twig (100%) rename {app/Resources/TwigBundle/views => templates/TwigBundle}/Exception/error404.html.twig (100%) rename {app/Resources/TwigBundle/views => templates/TwigBundle}/Exception/error500.html.twig (100%) rename {app/Resources/views => templates}/admin/blog/_delete_form.html.twig (100%) rename {app/Resources/views => templates}/admin/blog/_form.html.twig (100%) rename {app/Resources/views => templates}/admin/blog/edit.html.twig (100%) rename {app/Resources/views => templates}/admin/blog/index.html.twig (100%) rename {app/Resources/views => templates}/admin/blog/new.html.twig (100%) rename {app/Resources/views => templates}/admin/blog/show.html.twig (100%) rename {app/Resources/views => templates}/admin/layout.html.twig (100%) rename {app/Resources/views => templates}/base.html.twig (100%) rename {app/Resources/views => templates}/blog/_comment_form.html.twig (100%) rename {app/Resources/views => templates}/blog/_delete_post_confirmation.html.twig (100%) rename {app/Resources/views => templates}/blog/_post_tags.html.twig (100%) rename {app/Resources/views => templates}/blog/_rss.html.twig (100%) rename {app/Resources/views => templates}/blog/about.html.twig (100%) rename {app/Resources/views => templates}/blog/comment_form_error.html.twig (100%) rename {app/Resources/views => templates}/blog/index.html.twig (100%) rename {app/Resources/views => templates}/blog/index.xml.twig (100%) rename {app/Resources/views => templates}/blog/post_show.html.twig (100%) rename {app/Resources/views => templates}/default/_flash_messages.html.twig (100%) rename {app/Resources/views => templates}/default/homepage.html.twig (100%) rename {app/Resources/views => templates}/form/fields.html.twig (100%) rename {app/Resources/views => templates}/form/layout.html.twig (100%) rename {app/Resources/views => templates}/security/login.html.twig (100%) diff --git a/.travis.yml b/.travis.yml index bce9d32f4..8941e32e2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,7 +28,7 @@ script: - ./bin/console lint:yaml app/config - ./bin/console lint:yaml @CodeExplorerBundle # this checks that the Twig template files contain no syntax errors - - ./bin/console lint:twig app/Resources @CodeExplorerBundle + - ./bin/console lint:twig templates @CodeExplorerBundle # this checks that the XLIFF translations contain no syntax errors - ./bin/console lint:xliff translations # this checks that the application doesn't use dependencies with known security vulnerabilities diff --git a/app/config/config.yml b/app/config/config.yml index d26255e04..e433c1458 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -64,6 +64,9 @@ twig: form_themes: - 'form/layout.html.twig' - 'form/fields.html.twig' + paths: + "%kernel.project_dir%/templates/TwigBundle": Twig + "%kernel.project_dir%/templates": ~ # Doctrine Configuration (used to access databases and manipulate their information) doctrine: diff --git a/app/Resources/TwigBundle/views/Exception/error.html.twig b/templates/TwigBundle/Exception/error.html.twig similarity index 100% rename from app/Resources/TwigBundle/views/Exception/error.html.twig rename to templates/TwigBundle/Exception/error.html.twig diff --git a/app/Resources/TwigBundle/views/Exception/error403.html.twig b/templates/TwigBundle/Exception/error403.html.twig similarity index 100% rename from app/Resources/TwigBundle/views/Exception/error403.html.twig rename to templates/TwigBundle/Exception/error403.html.twig diff --git a/app/Resources/TwigBundle/views/Exception/error404.html.twig b/templates/TwigBundle/Exception/error404.html.twig similarity index 100% rename from app/Resources/TwigBundle/views/Exception/error404.html.twig rename to templates/TwigBundle/Exception/error404.html.twig diff --git a/app/Resources/TwigBundle/views/Exception/error500.html.twig b/templates/TwigBundle/Exception/error500.html.twig similarity index 100% rename from app/Resources/TwigBundle/views/Exception/error500.html.twig rename to templates/TwigBundle/Exception/error500.html.twig diff --git a/app/Resources/views/admin/blog/_delete_form.html.twig b/templates/admin/blog/_delete_form.html.twig similarity index 100% rename from app/Resources/views/admin/blog/_delete_form.html.twig rename to templates/admin/blog/_delete_form.html.twig diff --git a/app/Resources/views/admin/blog/_form.html.twig b/templates/admin/blog/_form.html.twig similarity index 100% rename from app/Resources/views/admin/blog/_form.html.twig rename to templates/admin/blog/_form.html.twig diff --git a/app/Resources/views/admin/blog/edit.html.twig b/templates/admin/blog/edit.html.twig similarity index 100% rename from app/Resources/views/admin/blog/edit.html.twig rename to templates/admin/blog/edit.html.twig diff --git a/app/Resources/views/admin/blog/index.html.twig b/templates/admin/blog/index.html.twig similarity index 100% rename from app/Resources/views/admin/blog/index.html.twig rename to templates/admin/blog/index.html.twig diff --git a/app/Resources/views/admin/blog/new.html.twig b/templates/admin/blog/new.html.twig similarity index 100% rename from app/Resources/views/admin/blog/new.html.twig rename to templates/admin/blog/new.html.twig diff --git a/app/Resources/views/admin/blog/show.html.twig b/templates/admin/blog/show.html.twig similarity index 100% rename from app/Resources/views/admin/blog/show.html.twig rename to templates/admin/blog/show.html.twig diff --git a/app/Resources/views/admin/layout.html.twig b/templates/admin/layout.html.twig similarity index 100% rename from app/Resources/views/admin/layout.html.twig rename to templates/admin/layout.html.twig diff --git a/app/Resources/views/base.html.twig b/templates/base.html.twig similarity index 100% rename from app/Resources/views/base.html.twig rename to templates/base.html.twig diff --git a/app/Resources/views/blog/_comment_form.html.twig b/templates/blog/_comment_form.html.twig similarity index 100% rename from app/Resources/views/blog/_comment_form.html.twig rename to templates/blog/_comment_form.html.twig diff --git a/app/Resources/views/blog/_delete_post_confirmation.html.twig b/templates/blog/_delete_post_confirmation.html.twig similarity index 100% rename from app/Resources/views/blog/_delete_post_confirmation.html.twig rename to templates/blog/_delete_post_confirmation.html.twig diff --git a/app/Resources/views/blog/_post_tags.html.twig b/templates/blog/_post_tags.html.twig similarity index 100% rename from app/Resources/views/blog/_post_tags.html.twig rename to templates/blog/_post_tags.html.twig diff --git a/app/Resources/views/blog/_rss.html.twig b/templates/blog/_rss.html.twig similarity index 100% rename from app/Resources/views/blog/_rss.html.twig rename to templates/blog/_rss.html.twig diff --git a/app/Resources/views/blog/about.html.twig b/templates/blog/about.html.twig similarity index 100% rename from app/Resources/views/blog/about.html.twig rename to templates/blog/about.html.twig diff --git a/app/Resources/views/blog/comment_form_error.html.twig b/templates/blog/comment_form_error.html.twig similarity index 100% rename from app/Resources/views/blog/comment_form_error.html.twig rename to templates/blog/comment_form_error.html.twig diff --git a/app/Resources/views/blog/index.html.twig b/templates/blog/index.html.twig similarity index 100% rename from app/Resources/views/blog/index.html.twig rename to templates/blog/index.html.twig diff --git a/app/Resources/views/blog/index.xml.twig b/templates/blog/index.xml.twig similarity index 100% rename from app/Resources/views/blog/index.xml.twig rename to templates/blog/index.xml.twig diff --git a/app/Resources/views/blog/post_show.html.twig b/templates/blog/post_show.html.twig similarity index 100% rename from app/Resources/views/blog/post_show.html.twig rename to templates/blog/post_show.html.twig diff --git a/app/Resources/views/default/_flash_messages.html.twig b/templates/default/_flash_messages.html.twig similarity index 100% rename from app/Resources/views/default/_flash_messages.html.twig rename to templates/default/_flash_messages.html.twig diff --git a/app/Resources/views/default/homepage.html.twig b/templates/default/homepage.html.twig similarity index 100% rename from app/Resources/views/default/homepage.html.twig rename to templates/default/homepage.html.twig diff --git a/app/Resources/views/form/fields.html.twig b/templates/form/fields.html.twig similarity index 100% rename from app/Resources/views/form/fields.html.twig rename to templates/form/fields.html.twig diff --git a/app/Resources/views/form/layout.html.twig b/templates/form/layout.html.twig similarity index 100% rename from app/Resources/views/form/layout.html.twig rename to templates/form/layout.html.twig diff --git a/app/Resources/views/security/login.html.twig b/templates/security/login.html.twig similarity index 100% rename from app/Resources/views/security/login.html.twig rename to templates/security/login.html.twig From 77afb2c94ca2fec9f1f63c596b82c327e724eadf Mon Sep 17 00:00:00 2001 From: mstrom Date: Sun, 2 Jul 2017 11:37:31 -0700 Subject: [PATCH 6/6] Update config.yml --- app/config/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/config/config.yml b/app/config/config.yml index e433c1458..98c821f15 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -30,7 +30,7 @@ framework: # and with different cache configurations for each fragment # https://symfony.com/doc/current/book/http_cache.html#edge-side-includes esi: { enabled: true } - translator: { fallback: '%locale%', paths: ["%kernel.project_dir%/translations"] } + translator: { fallback: '%locale%', paths: ['%kernel.project_dir%/translations'] } secret: '%env(SYMFONY_SECRET)%' router: resource: '%kernel.project_dir%/app/config/routing.yml' @@ -65,8 +65,8 @@ twig: - 'form/layout.html.twig' - 'form/fields.html.twig' paths: - "%kernel.project_dir%/templates/TwigBundle": Twig - "%kernel.project_dir%/templates": ~ + '%kernel.project_dir%/templates/TwigBundle': Twig + '%kernel.project_dir%/templates': ~ # Doctrine Configuration (used to access databases and manipulate their information) doctrine: