minor #338 Fix some Symfony Deprecations (dannyvw)

This PR was merged into the 1.9-dev branch. Discussion ---------- | Q | A | --------------- | ----- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | yes | Related tickets | partially #335 | License | MIT Commits ------- a8381bd Fix controller single colon fbc635f Fix DataTransformer 98b1760 Fix ResourceLoader getResolver 8dcf541 Fix isFileUpload 3b0a326 Change var in RecursiveTransformer 23aa618 Update docs 59aae45 Fix CI
Sylius · Feb 28, 2022 · 7acdfb9 · 7acdfb9
2 parents 0580fbb + 59aae45
commit 7acdfb9
Show file tree

Hide file tree

Showing 11 changed files with 146 additions and 143 deletions.
diff --git a/docs/create_resource.md b/docs/create_resource.md
@@ -10,7 +10,7 @@ app_book_create:
     path: /books/new
     methods: [GET, POST]
     defaults:
-        _controller: app.controller.book:createAction
+        _controller: app.controller.book::createAction
 ```
 Done! Now when you go to ``/books/new``, the ResourceController will use the factory (``app.factory.book``) to create a new book instance.
 Then it will try to create an ``app_book`` form, and set the newly created book as its data.
@@ -38,7 +38,7 @@ app_book_create:
     path: /books/new
     methods: [GET, POST]
     defaults:
-        _controller: app.controller.book:createAction
+        _controller: app.controller.book::createAction
         _sylius:
             template: Book/create.html.twig
 ```
@@ -55,7 +55,7 @@ app_book_create:
     path: /books/new
     methods: [GET, POST]
     defaults:
-        _controller: app.controller.book:createAction
+        _controller: app.controller.book::createAction
         _sylius:
             form: App\Form\BookType
 ```
@@ -73,7 +73,7 @@ app_book_create:
     path: /books/new
     methods: [GET, POST]
     defaults:
-        _controller: app.controller.book:createAction
+        _controller: app.controller.book::createAction
         _sylius:
             form:
                 type: App\Form\BookType
@@ -92,7 +92,7 @@ app_book_create:
     path: /books/new
     methods: [GET, POST]
     defaults:
-        _controller: app.controller.book:createAction
+        _controller: app.controller.book::createAction
         _sylius:
             factory: createNewWithAuthor
 ```
@@ -105,7 +105,7 @@ app_book_create:
     path: /books/{author}/new
     methods: [GET, POST]
     defaults:
-        _controller: app.controller.book:createAction
+        _controller: app.controller.book::createAction
         _sylius:
             factory:
                 method: createNewWithAuthor
@@ -124,7 +124,7 @@ app_book_create:
     path: /{authorId}/books/new
     methods: [GET, POST]
     defaults:
-        _controller: app.controller.book:createAction
+        _controller: app.controller.book::createAction
         _sylius:
             factory:
                 method: ["expr:service('app.factory.custom_book_factory')", "createNewByAuthorId"]
@@ -145,7 +145,7 @@ app_book_create:
     path: /books/new
     methods: [GET, POST]
     defaults:
-        _controller: app.controller.book:createAction
+        _controller: app.controller.book::createAction
         _sylius:
             redirect: app_book_index
 ```
@@ -158,7 +158,7 @@ app_book_create:
     path: /genre/{genreId}/books/new
     methods: [GET, POST]
     defaults:
-        _controller: app.controller.book:createAction
+        _controller: app.controller.book::createAction
         _sylius:
             redirect:
                 route: app_genre_show
@@ -173,7 +173,7 @@ app_book_create:
     path: /books/new
     methods: [GET, POST]
     defaults:
-        _controller: app.controller.book:createAction
+        _controller: app.controller.book::createAction
         _sylius:
             redirect:
                 route: app_book_show
@@ -194,7 +194,7 @@ app_book_customer_create:
     path: /customer/books/new
     methods: [GET, POST]
     defaults:
-        _controller: app.controller.book:createAction
+        _controller: app.controller.book::createAction
         _sylius:
             event: customer_create
 ```
@@ -210,7 +210,7 @@ app_genre_book_add:
     path: /{genreName}/books/add
     methods: [GET, POST]
     defaults:
-        _controller: app.controller.book:createAction
+        _controller: app.controller.book::createAction
         _sylius:
             template: Book/addToGenre.html.twig
             form: App\Form\BookType

diff --git a/docs/delete_resource.md b/docs/delete_resource.md
@@ -9,7 +9,7 @@ app_book_delete:
     path: /books/{id}
     methods: [DELETE]
     defaults:
-        _controller: app.controller.book:deleteAction
+        _controller: app.controller.book::deleteAction
 ```
 ## Calling an Action with DELETE method
 
@@ -39,7 +39,7 @@ app_book_delete:
     path: /genre/{genreId}/books/{id}
     methods: [DELETE]
     defaults:
-        _controller: app.controller.book:deleteAction
+        _controller: app.controller.book::deleteAction
         _sylius:
             criteria:
                 id: $id
@@ -58,7 +58,7 @@ app_book_delete:
     path: /genre/{genreId}/books/{id}
     methods: [DELETE]
     defaults:
-        _controller: app.controller.book:deleteAction
+        _controller: app.controller.book::deleteAction
         _sylius:
             redirect:
                 route: app_genre_show
@@ -78,7 +78,7 @@ app_book_customer_delete:
     path: /customer/book-delete/{id}
     methods: [DELETE]
     defaults:
-        _controller: app.controller.book:deleteAction
+        _controller: app.controller.book::deleteAction
         _sylius:
             event: customer_delete
 ```
@@ -96,7 +96,7 @@ app_genre_book_remove:
     path: /{genreName}/books/{id}/remove
     methods: [DELETE]
     defaults:
-        _controller: app.controller.book:deleteAction
+        _controller: app.controller.book::deleteAction
         _sylius:
             event: book_delete
             repository:

diff --git a/docs/index_resources.md b/docs/index_resources.md
@@ -10,7 +10,7 @@ app_book_index:
     path: /books
     methods: [GET]
     defaults:
-        _controller: app.controller.book:indexAction
+        _controller: app.controller.book::indexAction
 ```
 When you go to ``/books``, the ResourceController will use the repository (``app.repository.book``) to create a paginator.
 The default template will be rendered - ``App:Book:index.html.twig`` with the paginator as the ``books`` variable.
@@ -29,7 +29,7 @@ app_book_index_inactive:
     path: /books/disabled
     methods: [GET]
     defaults:
-        _controller: app.controller.book:indexAction
+        _controller: app.controller.book::indexAction
         _sylius:
             filterable: true
             criteria:
@@ -49,7 +49,7 @@ app_book_index_top:
     path: /books/top
     methods: [GET]
     defaults:
-        _controller: app.controller.book:indexAction
+        _controller: app.controller.book::indexAction
         _sylius:
             sortable: true
             sorting:
@@ -78,7 +78,7 @@ app_book_index_top:
     path: /books/top
     methods: [GET]
     defaults:
-        _controller: app.controller.book:indexAction
+        _controller: app.controller.book::indexAction
         _sylius:
             paginate: 5
             sortable: true
@@ -99,7 +99,7 @@ app_book_index_top3:
     path: /books/top
     methods: [GET]
     defaults:
-        _controller: app.controller.book:indexAction
+        _controller: app.controller.book::indexAction
         _sylius:
             paginate: false
             limit: 3
@@ -119,7 +119,7 @@ app_book_index:
     path: /{author}/books
     methods: [GET]
     defaults:
-        _controller: app.controller.book:indexAction
+        _controller: app.controller.book::indexAction
         _sylius:
             serialization_groups: { 0: Default, items: [ Custom ] }
 ```
@@ -136,7 +136,7 @@ app_book_index:
     path: /{author}/books
     methods: [GET]
     defaults:
-        _controller: app.controller.book:indexAction
+        _controller: app.controller.book::indexAction
         _sylius:
             template: Author/books.html.twig
             repository:

diff --git a/docs/show_resource.md b/docs/show_resource.md
@@ -15,7 +15,7 @@ app_book_show:
     path: /books/{id}
     methods: [GET]
     defaults:
-        _controller: app.controller.book:showAction
+        _controller: app.controller.book::showAction
 ```
 
 </details>
@@ -56,7 +56,7 @@ app_admin_book_show:
     path: /admin/books/{id}
     methods: [GET]
     defaults:
-        _controller: app.controller.book:showAction
+        _controller: app.controller.book::showAction
         _sylius:
             template: Admin/Book/show.html.twig
 ```
@@ -97,7 +97,7 @@ app_book_show:
     path: /books/{title}
     methods: [GET]
     defaults:
-        _controller: app.controller.book:showAction
+        _controller: app.controller.book::showAction
         _sylius:
             criteria:
                 title: $title
@@ -144,7 +144,7 @@ app_book_show:
     path: /books/{author}
     methods: [GET]
     defaults:
-        _controller: app.controller.book:showAction
+        _controller: app.controller.book::showAction
         _sylius:
             repository:
                 method: findOneNewestByAuthor
@@ -189,7 +189,7 @@ app_book_show:
     path: /books/{author}
     methods: [GET]
     defaults:
-        _controller: app.controller.book:showAction
+        _controller: app.controller.book::showAction
         _sylius:
             repository:
                 method: ["expr:service('app.repository.custom_book_repository')", "findOneNewestByAuthor"]
@@ -232,7 +232,7 @@ app_book_show:
     path: /books/{author}
     methods: [GET]
     defaults:
-        _controller: app.controller.book:showAction
+        _controller: app.controller.book::showAction
         _sylius:
             template: Book/show.html.twig
             repository:

diff --git a/docs/update_resource.md b/docs/update_resource.md
@@ -9,7 +9,7 @@ app_book_update:
     path: /books/{id}/edit
     methods: [GET, PUT]
     defaults:
-        _controller: app.controller.book:updateAction
+        _controller: app.controller.book::updateAction
 ```
 Done! Now when you go to ``/books/5/edit``, ResourceController will use the repository (``app.repository.book``) to find the book with id == **5**.
 If found it will create the ``app_book`` form, and set the existing book as data.
@@ -38,7 +38,7 @@ app_book_update:
     path: /books/{id}/edit
     methods: [GET, PUT]
     defaults:
-        _controller: app.controller.book:updateAction
+        _controller: app.controller.book::updateAction
         _sylius:
             template: Admin/Book/update.html.twig
 ```
@@ -54,7 +54,7 @@ app_book_update:
     path: /books/{id}/edit
     methods: [GET, PUT]
     defaults:
-        _controller: app.controller.book:updateAction
+        _controller: app.controller.book::updateAction
         _sylius:
             form: App\Form\BookType
 ```
@@ -71,7 +71,7 @@ app_book_update:
     path: /books/{id}/edit
     methods: [GET, PUT]
     defaults:
-        _controller: app.controller.book:updateAction
+        _controller: app.controller.book::updateAction
         _sylius:
             form:
                 type: app_book_custom
@@ -90,7 +90,7 @@ app_book_update:
     path: /books/{title}/edit
     methods: [GET, PUT]
     defaults:
-        _controller: app.controller.book:updateAction
+        _controller: app.controller.book::updateAction
         _sylius:
             criteria: { title: $title }
 ```
@@ -106,7 +106,7 @@ app_book_update:
     path: /books/{id}/edit
     methods: [GET, PUT]
     defaults:
-        _controller: app.controller.book:updateAction
+        _controller: app.controller.book::updateAction
         _sylius:
             redirect: app_book_index
 ```
@@ -119,7 +119,7 @@ app_book_update:
     path: /genre/{genreId}/books/{id}/edit
     methods: [GET, PUT]
     defaults:
-        _controller: app.controller.book:updateAction
+        _controller: app.controller.book::updateAction
         _sylius:
             redirect:
                 route: app_genre_show
@@ -139,7 +139,7 @@ app_book_customer_update:
     path: /customer/book-update/{id}
     methods: [GET, PUT]
     defaults:
-        _controller: app.controller.book:updateAction
+        _controller: app.controller.book::updateAction
         _sylius:
             event: customer_update
 ```
@@ -159,7 +159,7 @@ app_book_update:
     path: /books/{title}/edit
     methods: [GET, PUT]
     defaults:
-        _controller: app.controller.book:updateAction
+        _controller: app.controller.book::updateAction
         _sylius:
             criteria: { title: $title }
             return_content: true
@@ -178,7 +178,7 @@ app_book_update:
     path: /genre/{genreId}/books/{title}/edit
     methods: [GET, PUT, PATCH]
     defaults:
-        _controller: app.controller.book:updateAction
+        _controller: app.controller.book::updateAction
         _sylius:
             template: Book/editInGenre.html.twig
             form: app_book_custom

diff --git a/src/Bundle/Form/DataTransformer/CollectionToStringTransformer.php b/src/Bundle/Form/DataTransformer/CollectionToStringTransformer.php
@@ -27,23 +27,23 @@ public function __construct(string $delimiter)
         $this->delimiter = $delimiter;
     }
 
-    public function transform($values): string
+    public function transform($value): string
     {
-        if (!($values instanceof Collection)) {
+        if (!($value instanceof Collection)) {
             throw new TransformationFailedException(
                 sprintf(
                     'Expected "%s", but got "%s"',
                     Collection::class,
-                    is_object($values) ? get_class($values) : gettype($values)
+                    is_object($value) ? get_class($value) : gettype($value)
                 )
             );
         }
 
-        if ($values->isEmpty()) {
+        if ($value->isEmpty()) {
             return '';
         }
 
-        return implode($this->delimiter, $values->toArray());
+        return implode($this->delimiter, $value->toArray());
     }
 
     public function reverseTransform($value): Collection