timw4mail/collection-crud
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update to symfony 5.1

Browse Source
This commit is contained in:
Timothy Warren 2020-06-02 16:08:08 -04:00
parent 9fe4411a77
commit b78118790c
18 changed files with 2966 additions and 1567 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
composer.json
View File

@ -2,18 +2,21 @@
"type": "project",
"license": "proprietary",
"require": {
"php": "^7.2.0",
"php": "^7.4.0",
"sensio/framework-extra-bundle": "^5.2",
"symfony/debug-pack": "^1.0",
"symfony/form": "^4.0",
"symfony/form": "^5.1",
"symfony/maker-bundle": "^1.0",
"symfony/orm-pack": "^1.0",
"symfony/translation": "^4.3",
"symfony/validator": "^4.3"
"symfony/translation": "^5.1",
"symfony/twig-pack": "1.0.0",
"symfony/validator": "^5.1",
"symfony/yaml": "^5.1"
},
"require-dev": {
"roave/security-advisories": "dev-master",
"symfony/dotenv": "^4.0",
"symfony/debug": "^4.4.9",
"symfony/dotenv": "^5.1",
"symfony/flex": "^1.0"
},
"config": {
@ -46,8 +49,8 @@
},
"conflict": {
"symfony/symfony": "*",
"symfony/twig-bundle": "<3.3",
"symfony/debug": "<3.3"
"symfony/twig-bundle": "<4.4",
"symfony/debug": "<4.4"
},
"extra": {
"symfony": {

4280
composer.lock generated
View File

File diff suppressed because it is too large Load Diff

2
config/bundles.php
View File

@ -3,7 +3,6 @@
return [
App\App::class => ['all' => true],
Doctrine\Bundle\DoctrineBundle\DoctrineBundle::class => ['all' => true],
Doctrine\Bundle\DoctrineCacheBundle\DoctrineCacheBundle::class => ['all' => true],
Symfony\Bundle\FrameworkBundle\FrameworkBundle::class => ['all' => true],
Symfony\Bundle\MonologBundle\MonologBundle::class => ['all' => true],
Symfony\Bundle\TwigBundle\TwigBundle::class => ['all' => true],
@ -12,4 +11,5 @@ return [
Symfony\Bundle\MakerBundle\MakerBundle::class => ['dev' => true],
Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle::class => ['all' => true],
Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle::class => ['all' => true],
Twig\Extra\TwigExtraBundle\TwigExtraBundle::class => ['all' => true],
];

2
config/packages/doctrine.yaml
View File

@ -19,7 +19,7 @@ doctrine:
url: '%env(DATABASE_URL)%'
orm:
auto_generate_proxy_classes: '%kernel.debug%'
naming_strategy: doctrine.orm.naming_strategy.underscore
#naming_strategy: doctrine.orm.naming_strategy.underscore
auto_mapping: true
mappings:
App:

1
config/packages/routing.yaml
View File

@ -1,3 +1,4 @@
framework:
router:
strict_requirements: ~
utf8: true

1
config/packages/twig.yaml
View File

@ -3,3 +3,4 @@ twig:
paths: ['%kernel.project_dir%/templates']
debug: '%kernel.debug%'
strict_variables: '%kernel.debug%'
exception_controller: null

4
config/routes/annotations.yaml
View File

@ -1,3 +1,3 @@
controllers:
resource: ../src/Controller/
type: annotation
resource: '../../src/Controller/'
type: annotation

6
config/routes/dev/twig.yaml
View File

@ -1,3 +1,3 @@
_errors:
resource: '@TwigBundle/Resources/config/routing/errors.xml'
prefix: /_error
#_errors:
# resource: '@TwigBundle/Resources/config/routing/errors.xml'
# prefix: /_error

1
config/services.yaml
View File

@ -26,7 +26,6 @@ services:
# and have a tag that allows actions to type-hint services
App\Controller\:
resource: '../src/Controller'
public: true
tags: ['controller.service_arguments']
# add more services, or override services that need manual wiring

26
public/index.php
View File

@ -1,29 +1,29 @@
<?php declare(strict_types = 1);
<?php declare(strict_types=1);
use App\Kernel;
use Symfony\Component\Debug\Debug;
use Symfony\Component\Dotenv\Dotenv;
use Symfony\Component\ErrorHandler\Debug;
use Symfony\Component\HttpFoundation\Request;
require __DIR__ . '/../vendor/autoload.php';
require dirname(__DIR__).'/vendor/autoload.php';
// Parse env file
(new Dotenv())->load(__DIR__ . '/../.env');
(new Dotenv())->bootEnv(dirname(__DIR__).'/.env');
// Set environment
$_SERVER['APP_ENV'] = 'dev';
$_SERVER['APP_DEBUG'] = true;
if ($_SERVER['APP_DEBUG'] ?? ('prod' !== ($_SERVER['APP_ENV'] ?? 'dev'))) {
if ($_SERVER['APP_DEBUG']) {
umask(0000);
Debug::enable();
}
// Request::setTrustedProxies(['0.0.0.0/0'], Request::HEADER_FORWARDED);
if ($trustedProxies = $_SERVER['TRUSTED_PROXIES'] ?? false) {
Request::setTrustedProxies(explode(',', $trustedProxies), Request::HEADER_X_FORWARDED_ALL ^ Request::HEADER_X_FORWARDED_HOST);
}
$kernel = new Kernel('dev', true);
if ($trustedHosts = $_SERVER['TRUSTED_HOSTS'] ?? false) {
Request::setTrustedHosts([$trustedHosts]);
}
$kernel = new Kernel($_SERVER['APP_ENV'], (bool) $_SERVER['APP_DEBUG']);
$request = Request::createFromGlobals();
$response = $kernel->handle($request);
$response->send();

9
src/App.php
View File

@ -1,9 +0,0 @@
<?php declare(strict_types=1);
namespace App;
use Symfony\Component\HttpKernel\Bundle\Bundle;
class App extends Bundle
{
}

5
src/Controller/CameraController.php
View File

@ -6,6 +6,7 @@ use App\Entity\Camera;
use App\Form\CameraType;
use Doctrine\ORM\ORMInvalidArgumentException;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\Routing\Annotation\Route;
use Symfony\Component\Form\FormInterface;
use Symfony\Component\HttpFoundation\RedirectResponse;
@ -28,7 +29,7 @@ class CameraController extends AbstractController
*
* @Route("/", name="camera_index", methods={"GET"})
*/
public function indexAction()
public function indexAction(): Response
{
$em = $this->getDoctrine()->getManager();
@ -120,7 +121,7 @@ class CameraController extends AbstractController
*
* @param Camera $camera The camera entity
*
* @return \Symfony\Component\Form\FormInterface The form
* @return FormInterface The form
*/
private function createDeleteForm(Camera $camera): FormInterface
{

3
src/Controller/DefaultController.php
View File

@ -3,6 +3,7 @@
namespace App\Controller;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\Routing\Annotation\Route;
use Symfony\Component\HttpFoundation\Request;
@ -11,7 +12,7 @@ class DefaultController extends AbstractController
/**
* @Route("/", name="homepage")
*/
public function indexAction(Request $request)
public function indexAction(Request $request): Response
{
// replace this example code with whatever you need
return $this->render('default/index.html.twig', [

5
src/Controller/FilmController.php
View File

@ -6,6 +6,7 @@ use App\Entity\Film;
use App\Form\FilmType;
use Doctrine\Common\Collections\Criteria;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\Routing\Annotation\Route;
use Symfony\Component\Form\FormInterface;
use Symfony\Component\HttpFoundation\Request;
@ -27,7 +28,7 @@ class FilmController extends AbstractController
*
* @Route("/", name="film_index", methods={"GET"})
*/
public function indexAction()
public function indexAction(): Response
{
$repo = $this->getDoctrine()->getManager()->getRepository(self::ENTITY);
@ -104,7 +105,7 @@ class FilmController extends AbstractController
*
* @param Film $film The film entity
*
* @return \Symfony\Component\Form\FormInterface The form
* @return FormInterface The form
*/
private function createDeleteForm(Film $film): FormInterface
{

77
src/Kernel.php
View File

@ -1,64 +1,37 @@
<?php declare(strict_types=1);
/*
* This file is part of the Symfony package.
*
* (c) Fabien Potencier <fabien@symfony.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace App;
use Symfony\Bundle\FrameworkBundle\Kernel\MicroKernelTrait;
use Symfony\Component\Config\Loader\LoaderInterface;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
use Symfony\Component\HttpKernel\Kernel as BaseKernel;
use Symfony\Component\Routing\RouteCollectionBuilder;
use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
class Kernel extends BaseKernel
{
use MicroKernelTrait;
use MicroKernelTrait;
const CONFIG_EXTS = '.{php,xml,yaml,yml}';
protected function configureContainer(ContainerConfigurator $container): void
{
$container->import('../config/{packages}/*.yaml');
$container->import('../config/{packages}/'.$this->environment.'/*.yaml');
$container->import('../config/{services}.yaml');
$container->import('../config/{services}_'.$this->environment.'.yaml');
}
protected $loadClassCache = FALSE;
public function getCacheDir()
{
//return '/dev/null';
return $this->getProjectDir().'/var/cache/'.$this->environment;
}
public function getLogDir()
{
return $this->getProjectDir().'/var/log';
}
public function registerBundles()
{
$contents = require $this->getProjectDir().'/config/bundles.php';
foreach ($contents as $class => $envs) {
if (isset($envs['all']) || isset($envs[$this->environment])) {
yield new $class();
}
}
}
protected function configureContainer(ContainerBuilder $container, LoaderInterface $loader)
{
$container->setParameter('container.autowiring.strict_mode', true);
$container->setParameter('container.dumper.inline_class_loader', true);
$confDir = $this->getProjectDir().'/config';
$loader->load($confDir.'/packages/*'.self::CONFIG_EXTS, 'glob');
if (is_dir($confDir.'/packages/'.$this->environment)) {
$loader->load($confDir.'/packages/'.$this->environment.'/**/*'.self::CONFIG_EXTS, 'glob');
}
$loader->load($confDir.'/services'.self::CONFIG_EXTS, 'glob');
$loader->load($confDir.'/services_'.$this->environment.self::CONFIG_EXTS, 'glob');
}
protected function configureRoutes(RouteCollectionBuilder $routes)
{
$confDir = $this->getProjectDir().'/config';
if (is_dir($confDir.'/routes/')) {
$routes->import($confDir.'/routes/*'.self::CONFIG_EXTS, '/', 'glob');
}
if (is_dir($confDir.'/routes/'.$this->environment)) {
$routes->import($confDir.'/routes/'.$this->environment.'/**/*'.self::CONFIG_EXTS, '/', 'glob');
}
$routes->import($confDir.'/routes'.self::CONFIG_EXTS, '/', 'glob');
}
protected function configureRoutes(RoutingConfigurator $routes): void
{
$routes->import('../config/{routes}/'.$this->environment.'/*.yaml');
$routes->import('../config/{routes}/*.yaml');
$routes->import('../config/{routes}.yaml');
}
}

70
symfony.lock
View File

@ -29,9 +29,6 @@
"ref": "44d3aa7752dd46f77ba11af2297a25e1dedfb4d0"
}
},
"doctrine/doctrine-cache-bundle": {
"version": "1.3.2"
},
"doctrine/doctrine-migrations-bundle": {
"version": "1.2",
"recipe": {
@ -65,17 +62,17 @@
"doctrine/reflection": {
"version": "v1.0.0"
},
"easycorp/easy-log-handler": {
"version": "1.0",
"recipe": {
"repo": "github.com/symfony/recipes",
"branch": "master",
"version": "1.0",
"ref": "70062abc2cd58794d2a90274502f81b55cd9951b"
}
"doctrine/sql-formatter": {
"version": "1.0.1"
},
"jdorn/sql-formatter": {
"version": "v1.2.17"
"laminas/laminas-code": {
"version": "3.4.1"
},
"laminas/laminas-eventmanager": {
"version": "3.2.1"
},
"laminas/laminas-zendframework-bridge": {
"version": "1.0.0"
},
"monolog/monolog": {
"version": "1.23.0"
@ -89,12 +86,18 @@
"ocramius/proxy-manager": {
"version": "2.2.0"
},
"php": {
"version": "7.4"
},
"psr/cache": {
"version": "1.0.1"
},
"psr/container": {
"version": "1.0.0"
},
"psr/event-dispatcher": {
"version": "1.0.0"
},
"psr/log": {
"version": "1.0.2"
},
@ -129,7 +132,7 @@
}
},
"symfony/debug": {
"version": "v3.3.13"
"version": "v4.4.9"
},
"symfony/debug-bundle": {
"version": "4.1",
@ -146,12 +149,18 @@
"symfony/dependency-injection": {
"version": "v3.3.13"
},
"symfony/deprecation-contracts": {
"version": "v2.1.2"
},
"symfony/doctrine-bridge": {
"version": "v4.0.0"
},
"symfony/dotenv": {
"version": "v3.3.13"
},
"symfony/error-handler": {
"version": "v4.4.0"
},
"symfony/event-dispatcher": {
"version": "v3.3.13"
},
@ -206,9 +215,6 @@
"ref": "fadbfe33303a76e25cb63401050439aa9b1a9c7f"
}
},
"symfony/mime": {
"version": "v4.3.0"
},
"symfony/monolog-bridge": {
"version": "v4.1.1"
},
@ -230,27 +236,33 @@
"symfony/polyfill-ctype": {
"version": "v1.8.0"
},
"symfony/polyfill-intl-grapheme": {
"version": "v1.17.0"
},
"symfony/polyfill-intl-icu": {
"version": "v1.6.0"
},
"symfony/polyfill-intl-idn": {
"version": "v1.11.0"
"symfony/polyfill-intl-normalizer": {
"version": "v1.17.0"
},
"symfony/polyfill-mbstring": {
"version": "v1.6.0"
},
"symfony/polyfill-php72": {
"version": "v1.8.0"
},
"symfony/polyfill-php73": {
"version": "v1.11.0"
},
"symfony/polyfill-php80": {
"version": "v1.17.0"
},
"symfony/profiler-pack": {
"version": "v1.0.3"
},
"symfony/property-access": {
"version": "v4.0.0"
},
"symfony/property-info": {
"version": "v5.1.0"
},
"symfony/routing": {
"version": "3.3",
"recipe": {
@ -266,6 +278,9 @@
"symfony/stopwatch": {
"version": "v4.1.1"
},
"symfony/string": {
"version": "v5.1.0"
},
"symfony/translation": {
"version": "3.3",
"recipe": {
@ -294,6 +309,9 @@
"ref": "f75ac166398e107796ca94cc57fa1edaa06ec47f"
}
},
"symfony/twig-pack": {
"version": "v1.0.0"
},
"symfony/validator": {
"version": "4.3",
"recipe": {
@ -323,11 +341,17 @@
}
},
"symfony/yaml": {
"version": "v3.3.13"
"version": "v5.0.7"
},
"twig/extra-bundle": {
"version": "v3.0.3"
},
"twig/twig": {
"version": "v2.4.4"
},
"webimpress/safe-writer": {
"version": "2.0.0"
},
"zendframework/zend-code": {
"version": "3.3.0"
},

18
templates/base.html.twig
View File

@ -16,6 +16,24 @@
{% include 'header.html.twig' %}
{% block body %}{% endblock %}
</main>
<!-- Matomo -->
<script type="text/javascript">
var _paq = window._paq || [];
/* tracker methods like "setCustomDimension" should be called before "trackPageView" */
_paq.push(['trackPageView']);
_paq.push(['enableLinkTracking']);
(function() {
var u="https://static.timshomepage.net/piwik/";
_paq.push(['setTrackerUrl', u+'matomo.php']);
_paq.push(['setSiteId', '7']);
var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
})();
</script>
<noscript><p><img src="https://static.timshomepage.net/piwik/matomo.php?idsite=7&amp;rec=1" style="border:0;" alt="" /></p></noscript>
<!-- End Matomo Code -->
<script src="/js/vendor/jquery.js"></script>
<script src="/js/vendor/what-input.js"></script>
<script src="/js/vendor/foundation.min.js"></script>

6
templates/header.html.twig
View File

@ -10,7 +10,7 @@
<a href="{{ path('flash_index') }}">📸 Flashes</a>
</li>
<li class="{{ route starts with 'lens_' ? 'is-active' }}">
<a href="{{ path('lens_index') }}">Lenses</a>
<a href="{{ path('lens_index') }}">🔎 Lenses</a>
</li>
</ul>
<ul class="menu">
@ -22,7 +22,7 @@
<a href="{{ path('previously-owned-flash_index') }}">📸 Flashes</a>
</li>
<li class="{{ route starts with 'previously-owned-lens' ? 'is-active' }}">
<a href="{{ path('previously-owned-lens_index') }}">Lenses</a>
<a href="{{ path('previously-owned-lens_index') }}">🔎 Lenses</a>
</li>
</ul>
<ul class="menu">
@ -31,7 +31,7 @@
<a href="{{ path('film_index') }}">🎞️ Film</a>
</li>
<li class="{{ route starts with 'camera-type_' ? 'is-active' }}">
<a href="{{ path('camera-type_index') }}">Camera Types</a>
<a href="{{ path('camera-type_index') }}">🎥 Camera Types</a>
</li>
</ul>
</div>