Fix some SF 3.4 deprecations

rpryap · Feb 1, 2019 · f501fb5 · f501fb5
1 parent ca5de46
commit f501fb5
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 17 deletions.
diff --git a/app/config/config_dev.yml b/app/config/config_dev.yml
@@ -26,10 +26,10 @@ monolog:
             type:   rotating_file
             path:   "%kernel.logs_dir%/%kernel.environment%.log"
             level:  debug
-            channels: [!event]
+            channels: ["!event"]
         console:
             type:   console
-            channels: [!event, !doctrine]
+            channels: ["!event", "!doctrine"]
         # uncomment to get logging in your browser
         # you may have to allow bigger header sizes in your Web server configuration
         #firephp:

diff --git a/src/Cocorico/CMSBundle/Resources/config/services.yml b/src/Cocorico/CMSBundle/Resources/config/services.yml
@@ -6,4 +6,5 @@ services:
     cocorico_cms.footer.manager:
         class: Cocorico\CMSBundle\Model\Manager\FooterManager
         arguments:
-            - "@doctrine.orm.entity_manager"
+            - "@doctrine.orm.entity_manager"
+        public: true
diff --git a/src/Cocorico/CoreBundle/Resources/config/Services/entities_manager.yml b/src/Cocorico/CoreBundle/Resources/config/Services/entities_manager.yml
@@ -11,6 +11,7 @@ services:
                 cocorico_time_unit: "%cocorico.time_unit%"
                 cocorico_listing_search_max_per_page: "%cocorico.listing_search_max_per_page%"
                 cocorico_listing_availability_status: "%cocorico.listing_availability_status%"
+        public: true
 
     cocorico.listing.manager:
         class: Cocorico\CoreBundle\Model\Manager\ListingManager
@@ -76,6 +77,7 @@ services:
             - "@doctrine.orm.entity_manager"
             - "@router"
             - "%cocorico.locales%"
+        public: true
 
     #Documents Manager
     cocorico.listing_availability.manager:

diff --git a/src/Cocorico/CoreBundle/Resources/config/config.yml b/src/Cocorico/CoreBundle/Resources/config/config.yml
@@ -104,12 +104,12 @@ doctrine:
 
         resolve_target_entities:
             #Don't put double quotes!
-            Cocorico\CoreBundle\Model\ListingOptionInterface: %cocorico_listing_option.listing_option.entity_class%
-            Cocorico\CoreBundle\Model\BookingOptionInterface: %cocorico_listing_option.booking_option.entity_class%
-            Cocorico\CoreBundle\Model\ListingCategoryFieldInterface: %cocorico_listing_category_field.entity_class%
-            Cocorico\CoreBundle\Model\ListingCategoryFieldValueInterface: %cocorico_listing_category_field_value.entity_class%
-            Cocorico\CoreBundle\Model\ListingCategoryListingCategoryFieldInterface: %cocorico_listing_category_listing_category_field.entity_class%
-            Cocorico\CoreBundle\Model\BookingDepositRefundInterface: %cocorico_listing_deposit.booking_deposit_refund.entity_class%
+            Cocorico\CoreBundle\Model\ListingOptionInterface: "%cocorico_listing_option.listing_option.entity_class%"
+            Cocorico\CoreBundle\Model\BookingOptionInterface: "%cocorico_listing_option.booking_option.entity_class%"
+            Cocorico\CoreBundle\Model\ListingCategoryFieldInterface: "%cocorico_listing_category_field.entity_class%"
+            Cocorico\CoreBundle\Model\ListingCategoryFieldValueInterface: "%cocorico_listing_category_field_value.entity_class%"
+            Cocorico\CoreBundle\Model\ListingCategoryListingCategoryFieldInterface: "%cocorico_listing_category_listing_category_field.entity_class%"
+            Cocorico\CoreBundle\Model\BookingDepositRefundInterface: "%cocorico_listing_deposit.booking_deposit_refund.entity_class%"
 
     dbal:
         types:

diff --git a/src/Cocorico/CoreBundle/Resources/config/services.yml b/src/Cocorico/CoreBundle/Resources/config/services.yml
@@ -18,6 +18,7 @@ services:
         arguments:
             - "@request_stack"
             - "%cocorico.listing_search_max_per_page%"
+        public: true
 
     #Namers
     cocorico.namer.image_namer:

diff --git a/src/Cocorico/MessageBundle/Resources/config/services.yml b/src/Cocorico/MessageBundle/Resources/config/services.yml
@@ -20,7 +20,6 @@ services:
             - "@fos_message.composer"
             - "@fos_message.sender"
             - "@fos_message.participant_provider"
-        scope: request
         public: false
 
 
@@ -39,7 +38,6 @@ services:
             - "@fos_message.composer"
             - "@fos_message.sender"
             - "@fos_message.participant_provider"
-        scope: request
         public: false
 
 

diff --git a/src/Cocorico/UserBundle/Admin/UserAddressAdmin.php b/src/Cocorico/UserBundle/Admin/UserAddressAdmin.php
@@ -3,12 +3,12 @@
 namespace Cocorico\UserBundle\Admin;
 
 use Cocorico\UserBundle\Entity\UserAddress;
-use Sonata\AdminBundle\Admin\Admin;
+use Sonata\AdminBundle\Admin\AbstractAdmin;
 use Sonata\AdminBundle\Form\FormMapper;
 use Sonata\AdminBundle\Route\RouteCollection;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 
-class UserAddressAdmin extends Admin
+class UserAddressAdmin extends AbstractAdmin
 {
     protected $translationDomain = 'SonataAdminBundle';
     protected $baseRoutePattern = 'user-address';
@@ -19,6 +19,7 @@ public function setLocales($locales)
         $this->locales = $locales;
     }
 
+    /** @inheritdoc */
     protected function configureFormFields(FormMapper $formMapper)
     {
         $formMapper

diff --git a/src/Cocorico/UserBundle/Resources/config/config.yml b/src/Cocorico/UserBundle/Resources/config/config.yml
@@ -72,10 +72,10 @@ doctrine:
 #                    FOSUserBundle: ~
         resolve_target_entities:
             #Don't put double quotes!
-            Cocorico\UserBundle\Model\ListingAlertInterface: %cocorico_listing_alert.entity_class%
-            Cocorico\UserBundle\Model\BookingDepositRefundAsAskerInterface: %cocorico_listing_deposit.booking_deposit_refund.entity_class%
-            Cocorico\UserBundle\Model\BookingDepositRefundAsOffererInterface: %cocorico_listing_deposit.booking_deposit_refund.entity_class%
-            Cocorico\UserBundle\Model\UserCardInterface: %cocorico_mangopay_card_saving.user_card.entity_class%
+            Cocorico\UserBundle\Model\ListingAlertInterface: "%cocorico_listing_alert.entity_class%"
+            Cocorico\UserBundle\Model\BookingDepositRefundAsAskerInterface: "%cocorico_listing_deposit.booking_deposit_refund.entity_class%"
+            Cocorico\UserBundle\Model\BookingDepositRefundAsOffererInterface: "%cocorico_listing_deposit.booking_deposit_refund.entity_class%"
+            Cocorico\UserBundle\Model\UserCardInterface: "%cocorico_mangopay_card_saving.user_card.entity_class%"
 
 oneup_uploader:
     mappings: