Deal with some Symfony deprecations, add some emoji as icons
This commit is contained in:
parent
513974292a
commit
37e9726588
920
composer.lock
generated
920
composer.lock
generated
File diff suppressed because it is too large
Load Diff
@ -5,7 +5,7 @@ namespace App\Controller;
|
|||||||
use App\Entity\Camera;
|
use App\Entity\Camera;
|
||||||
use App\Form\CameraType;
|
use App\Form\CameraType;
|
||||||
use Doctrine\ORM\ORMInvalidArgumentException;
|
use Doctrine\ORM\ORMInvalidArgumentException;
|
||||||
use Symfony\Bundle\FrameworkBundle\Controller\Controller;
|
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
|
||||||
use Symfony\Component\Routing\Annotation\Route;
|
use Symfony\Component\Routing\Annotation\Route;
|
||||||
use Symfony\Component\Form\FormInterface;
|
use Symfony\Component\Form\FormInterface;
|
||||||
use Symfony\Component\HttpFoundation\RedirectResponse;
|
use Symfony\Component\HttpFoundation\RedirectResponse;
|
||||||
@ -16,7 +16,7 @@ use Symfony\Component\HttpFoundation\Request;
|
|||||||
*
|
*
|
||||||
* @Route("camera")
|
* @Route("camera")
|
||||||
*/
|
*/
|
||||||
class CameraController extends Controller
|
class CameraController extends AbstractController
|
||||||
{
|
{
|
||||||
use FormControllerTrait;
|
use FormControllerTrait;
|
||||||
|
|
||||||
|
@ -4,7 +4,7 @@ namespace App\Controller;
|
|||||||
|
|
||||||
use App\Entity\CameraType;
|
use App\Entity\CameraType;
|
||||||
use App\Form\CameraTypeType;
|
use App\Form\CameraTypeType;
|
||||||
use Symfony\Bundle\FrameworkBundle\Controller\Controller;
|
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
|
||||||
use Symfony\Component\Routing\Annotation\Route;
|
use Symfony\Component\Routing\Annotation\Route;
|
||||||
use Symfony\Component\HttpFoundation\Request;
|
use Symfony\Component\HttpFoundation\Request;
|
||||||
|
|
||||||
@ -13,7 +13,7 @@ use Symfony\Component\HttpFoundation\Request;
|
|||||||
*
|
*
|
||||||
* @Route("camera-type")
|
* @Route("camera-type")
|
||||||
*/
|
*/
|
||||||
class CameraTypeController extends Controller
|
class CameraTypeController extends AbstractController
|
||||||
{
|
{
|
||||||
use FormControllerTrait;
|
use FormControllerTrait;
|
||||||
|
|
||||||
|
@ -2,11 +2,11 @@
|
|||||||
|
|
||||||
namespace App\Controller;
|
namespace App\Controller;
|
||||||
|
|
||||||
use Symfony\Bundle\FrameworkBundle\Controller\Controller;
|
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
|
||||||
use Symfony\Component\Routing\Annotation\Route;
|
use Symfony\Component\Routing\Annotation\Route;
|
||||||
use Symfony\Component\HttpFoundation\Request;
|
use Symfony\Component\HttpFoundation\Request;
|
||||||
|
|
||||||
class DefaultController extends Controller
|
class DefaultController extends AbstractController
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
* @Route("/", name="homepage")
|
* @Route("/", name="homepage")
|
||||||
|
@ -5,7 +5,7 @@ namespace App\Controller;
|
|||||||
use App\Entity\Film;
|
use App\Entity\Film;
|
||||||
use App\Form\FilmType;
|
use App\Form\FilmType;
|
||||||
use Doctrine\Common\Collections\Criteria;
|
use Doctrine\Common\Collections\Criteria;
|
||||||
use Symfony\Bundle\FrameworkBundle\Controller\Controller;
|
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
|
||||||
use Symfony\Component\Routing\Annotation\Route;
|
use Symfony\Component\Routing\Annotation\Route;
|
||||||
use Symfony\Component\Form\FormInterface;
|
use Symfony\Component\Form\FormInterface;
|
||||||
use Symfony\Component\HttpFoundation\Request;
|
use Symfony\Component\HttpFoundation\Request;
|
||||||
@ -15,7 +15,7 @@ use Symfony\Component\HttpFoundation\Request;
|
|||||||
*
|
*
|
||||||
* @Route("film")
|
* @Route("film")
|
||||||
*/
|
*/
|
||||||
class FilmController extends Controller
|
class FilmController extends AbstractController
|
||||||
{
|
{
|
||||||
use FormControllerTrait;
|
use FormControllerTrait;
|
||||||
|
|
||||||
|
@ -4,7 +4,7 @@ namespace App\Controller;
|
|||||||
|
|
||||||
use App\Entity\Flash;
|
use App\Entity\Flash;
|
||||||
use App\Form\FlashType;
|
use App\Form\FlashType;
|
||||||
use Symfony\Bundle\FrameworkBundle\Controller\Controller;
|
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
|
||||||
use Symfony\Component\Routing\Annotation\Route;
|
use Symfony\Component\Routing\Annotation\Route;
|
||||||
use Symfony\Component\HttpFoundation\Request;
|
use Symfony\Component\HttpFoundation\Request;
|
||||||
|
|
||||||
@ -13,7 +13,7 @@ use Symfony\Component\HttpFoundation\Request;
|
|||||||
*
|
*
|
||||||
* @Route("flash")
|
* @Route("flash")
|
||||||
*/
|
*/
|
||||||
class FlashController extends Controller
|
class FlashController extends AbstractController
|
||||||
{
|
{
|
||||||
use FormControllerTrait;
|
use FormControllerTrait;
|
||||||
|
|
||||||
|
@ -4,7 +4,7 @@ namespace App\Controller;
|
|||||||
|
|
||||||
use App\Entity\Lenses;
|
use App\Entity\Lenses;
|
||||||
use App\Form\LensesType;
|
use App\Form\LensesType;
|
||||||
use Symfony\Bundle\FrameworkBundle\Controller\Controller;
|
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
|
||||||
use Symfony\Component\Routing\Annotation\Route;
|
use Symfony\Component\Routing\Annotation\Route;
|
||||||
use Symfony\Component\Form\FormInterface;
|
use Symfony\Component\Form\FormInterface;
|
||||||
use Symfony\Component\HttpFoundation\{Request, RedirectResponse};
|
use Symfony\Component\HttpFoundation\{Request, RedirectResponse};
|
||||||
@ -14,7 +14,7 @@ use Symfony\Component\HttpFoundation\{Request, RedirectResponse};
|
|||||||
*
|
*
|
||||||
* @Route("lens")
|
* @Route("lens")
|
||||||
*/
|
*/
|
||||||
class LensesController extends Controller
|
class LensesController extends AbstractController
|
||||||
{
|
{
|
||||||
use FormControllerTrait;
|
use FormControllerTrait;
|
||||||
|
|
||||||
|
@ -4,7 +4,7 @@ namespace App\Controller;
|
|||||||
|
|
||||||
use App\Entity\PreviouslyOwnedCamera;
|
use App\Entity\PreviouslyOwnedCamera;
|
||||||
use App\Form\PreviouslyOwnedCameraType;
|
use App\Form\PreviouslyOwnedCameraType;
|
||||||
use Symfony\Bundle\FrameworkBundle\Controller\Controller;
|
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
|
||||||
use Symfony\Component\Routing\Annotation\Route;
|
use Symfony\Component\Routing\Annotation\Route;
|
||||||
use Symfony\Component\Form\FormInterface;
|
use Symfony\Component\Form\FormInterface;
|
||||||
use Symfony\Component\HttpFoundation\{RedirectResponse, Request};
|
use Symfony\Component\HttpFoundation\{RedirectResponse, Request};
|
||||||
@ -14,7 +14,7 @@ use Symfony\Component\HttpFoundation\{RedirectResponse, Request};
|
|||||||
*
|
*
|
||||||
* @Route("previously-owned-camera")
|
* @Route("previously-owned-camera")
|
||||||
*/
|
*/
|
||||||
class PreviouslyOwnedCameraController extends Controller
|
class PreviouslyOwnedCameraController extends AbstractController
|
||||||
{
|
{
|
||||||
use FormControllerTrait;
|
use FormControllerTrait;
|
||||||
|
|
||||||
|
@ -4,7 +4,7 @@ namespace App\Controller;
|
|||||||
|
|
||||||
use App\Entity\PreviouslyOwnedFlash;
|
use App\Entity\PreviouslyOwnedFlash;
|
||||||
use App\Form\PreviouslyOwnedFlashType;
|
use App\Form\PreviouslyOwnedFlashType;
|
||||||
use Symfony\Bundle\FrameworkBundle\Controller\Controller;
|
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
|
||||||
use Symfony\Component\Routing\Annotation\Route;
|
use Symfony\Component\Routing\Annotation\Route;
|
||||||
use Symfony\Component\HttpFoundation\Request;
|
use Symfony\Component\HttpFoundation\Request;
|
||||||
|
|
||||||
@ -13,7 +13,7 @@ use Symfony\Component\HttpFoundation\Request;
|
|||||||
*
|
*
|
||||||
* @Route("previously-owned-flash")
|
* @Route("previously-owned-flash")
|
||||||
*/
|
*/
|
||||||
class PreviouslyOwnedFlashController extends Controller
|
class PreviouslyOwnedFlashController extends AbstractController
|
||||||
{
|
{
|
||||||
use FormControllerTrait;
|
use FormControllerTrait;
|
||||||
|
|
||||||
|
@ -4,14 +4,14 @@ namespace App\Controller;
|
|||||||
|
|
||||||
use App\Entity\PreviouslyOwnedLenses;
|
use App\Entity\PreviouslyOwnedLenses;
|
||||||
use App\Form\PreviouslyOwnedLensesType;
|
use App\Form\PreviouslyOwnedLensesType;
|
||||||
use Symfony\Bundle\FrameworkBundle\Controller\Controller;
|
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
|
||||||
use Symfony\Component\Routing\Annotation\Route;
|
use Symfony\Component\Routing\Annotation\Route;
|
||||||
use Symfony\Component\HttpFoundation\Request;
|
use Symfony\Component\HttpFoundation\Request;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @Route("previously-owned-lens")
|
* @Route("previously-owned-lens")
|
||||||
*/
|
*/
|
||||||
class PreviouslyOwnedLensesController extends Controller
|
class PreviouslyOwnedLensesController extends AbstractController
|
||||||
{
|
{
|
||||||
use FormControllerTrait;
|
use FormControllerTrait;
|
||||||
|
|
||||||
|
@ -128,6 +128,9 @@
|
|||||||
"ref": "9f94d3ea453cd8a3b95db7f82592d7344fe3a76a"
|
"ref": "9f94d3ea453cd8a3b95db7f82592d7344fe3a76a"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"symfony/contracts": {
|
||||||
|
"version": "v1.0.0"
|
||||||
|
},
|
||||||
"symfony/debug": {
|
"symfony/debug": {
|
||||||
"version": "v3.3.13"
|
"version": "v3.3.13"
|
||||||
},
|
},
|
||||||
@ -266,6 +269,9 @@
|
|||||||
"symfony/var-dumper": {
|
"symfony/var-dumper": {
|
||||||
"version": "v4.1.1"
|
"version": "v4.1.1"
|
||||||
},
|
},
|
||||||
|
"symfony/var-exporter": {
|
||||||
|
"version": "v4.2.0"
|
||||||
|
},
|
||||||
"symfony/web-profiler-bundle": {
|
"symfony/web-profiler-bundle": {
|
||||||
"version": "3.3",
|
"version": "3.3",
|
||||||
"recipe": {
|
"recipe": {
|
||||||
|
@ -4,10 +4,10 @@
|
|||||||
<ul class="menu">
|
<ul class="menu">
|
||||||
<li class="menu-text">Camera Collection</li>
|
<li class="menu-text">Camera Collection</li>
|
||||||
<li class="{{ route starts with 'camera_' ? 'is-active' }}">
|
<li class="{{ route starts with 'camera_' ? 'is-active' }}">
|
||||||
<a href="{{ path('camera_index') }}">Cameras</a>
|
<a href="{{ path('camera_index') }}">📷 Cameras</a>
|
||||||
</li>
|
</li>
|
||||||
<li class="{{ route starts with 'flash_' ? 'is-active' }}">
|
<li class="{{ route starts with 'flash_' ? 'is-active' }}">
|
||||||
<a href="{{ path('flash_index') }}">Flashes</a>
|
<a href="{{ path('flash_index') }}">📸 Flashes</a>
|
||||||
</li>
|
</li>
|
||||||
<li class="{{ route starts with 'lens_' ? 'is-active' }}">
|
<li class="{{ route starts with 'lens_' ? 'is-active' }}">
|
||||||
<a href="{{ path('lens_index') }}">Lenses</a>
|
<a href="{{ path('lens_index') }}">Lenses</a>
|
||||||
@ -16,10 +16,10 @@
|
|||||||
<ul class="menu">
|
<ul class="menu">
|
||||||
<li class="menu-text">Previously Owned</li>
|
<li class="menu-text">Previously Owned</li>
|
||||||
<li class="{{ route starts with 'previously-owned-camera' ? 'is-active' }}">
|
<li class="{{ route starts with 'previously-owned-camera' ? 'is-active' }}">
|
||||||
<a href="{{ path('previously-owned-camera_index') }}">Cameras</a>
|
<a href="{{ path('previously-owned-camera_index') }}">📷 Cameras</a>
|
||||||
</li>
|
</li>
|
||||||
<li class="{{ route starts with 'previously-owned-flash' ? 'is-active' }}">
|
<li class="{{ route starts with 'previously-owned-flash' ? 'is-active' }}">
|
||||||
<a href="{{ path('previously-owned-flash_index') }}">Flashes</a>
|
<a href="{{ path('previously-owned-flash_index') }}">📸 Flashes</a>
|
||||||
</li>
|
</li>
|
||||||
<li class="{{ route starts with 'previously-owned-lens' ? 'is-active' }}">
|
<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>
|
||||||
@ -28,7 +28,7 @@
|
|||||||
<ul class="menu">
|
<ul class="menu">
|
||||||
<li class="menu-text">Meta</li>
|
<li class="menu-text">Meta</li>
|
||||||
<li class="{{ route starts with 'film_' ? 'is-active' }}">
|
<li class="{{ route starts with 'film_' ? 'is-active' }}">
|
||||||
<a href="{{ path('film_index') }}">Film</a>
|
<a href="{{ path('film_index') }}">🎞️ Film</a>
|
||||||
</li>
|
</li>
|
||||||
<li class="{{ route starts with 'camera-type_' ? 'is-active' }}">
|
<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>
|
||||||
|
Loading…
Reference in New Issue
Block a user