Merge remote-tracking branch 'origin/2.x'

sonata-project · Nov 16, 2019 · 7327cb2 · 7327cb2
2 parents 981e452 + db268b1
commit 7327cb2
Show file tree

Hide file tree

Showing 13 changed files with 36 additions and 39 deletions.
diff --git a/.php_cs.dist b/.php_cs.dist
@@ -37,6 +37,7 @@ $rules = [
     '@PHP56Migration' => true,
     '@PHP56Migration:risky' => true,
     '@PHPUnit57Migration:risky' => true,
+    'single_line_throw' => false,
     '@PHP70Migration' => true,
     '@PHP70Migration:risky' => true,
     '@PHPUnit60Migration:risky' => true,

diff --git a/.travis.yml b/.travis.yml
@@ -12,6 +12,7 @@ language: php
 php:
   - '7.2'
   - '7.3'
+  - '7.4snapshot'
   - nightly
 
 dist: xenial
@@ -50,6 +51,7 @@ matrix:
     - php: '7.3'
       env: SYMFONY_DEPRECATIONS_HELPER=0
   allow_failures:
+    - php: 7.4snapshot
     - php: nightly
     - env: SYMFONY_DEPRECATIONS_HELPER=0
     - env: SYMFONY='dev-master as 3.4.x-dev'

diff --git a/.travis/install_test.sh b/.travis/install_test.sh
@@ -10,10 +10,4 @@ chmod u+x "${HOME}/bin/phpunit"
 wget https://github.com/satooshi/php-coveralls/releases/download/v1.0.1/coveralls.phar --output-document="${HOME}/bin/coveralls"
 chmod u+x "${HOME}/bin/coveralls"
 
-# To be removed when these issues are resolved:
-# https://github.com/composer/composer/issues/5355
-if [ "${COMPOSER_FLAGS}" = '--prefer-lowest' ]; then
-    composer update --prefer-dist --no-interaction --prefer-stable --quiet
-fi
-
 composer update --prefer-dist --no-interaction --prefer-stable ${COMPOSER_FLAGS}
diff --git a/src/CustomerBundle/Admin/AddressAdmin.php b/src/CustomerBundle/Admin/AddressAdmin.php
@@ -35,7 +35,7 @@ public function configure(): void
     public function configureFormFields(FormMapper $formMapper): void
     {
         $formMapper
-            ->with($this->trans('address.form.group_contact_label', [], 'SonataCustomerBundle'), [
+            ->with('address.form.group_contact_label', [
                 'class' => 'col-md-7',
             ])
                 ->add('firstname')
@@ -45,7 +45,7 @@ public function configureFormFields(FormMapper $formMapper): void
         ;
 
         $formMapper
-            ->with($this->trans('address.form.group_advanced_label', [], 'SonataCustomerBundle'), [
+            ->with('address.form.group_advanced_label', [
                 'class' => 'col-md-5',
             ])
                 ->add('type', AddressTypeType::class, ['translation_domain' => 'SonataCustomerBundle'])
@@ -54,14 +54,14 @@ public function configureFormFields(FormMapper $formMapper): void
             ->end();
 
         if (!$this->isChild()) {
-            $formMapper->with($this->trans('address.form.group_contact_label', [], 'SonataCustomerBundle'))
+            $formMapper->with('address.form.group_contact_label')
                 ->add('customer', ModelListType::class)
             ->end()
             ;
         }
 
         $formMapper
-            ->with($this->trans('address.form.group_address_label', [], 'SonataCustomerBundle'), [
+            ->with('address.form.group_address_label', [
                 'class' => 'col-md-12',
             ])
                 ->add('address1')

diff --git a/src/CustomerBundle/Admin/CustomerAdmin.php b/src/CustomerBundle/Admin/CustomerAdmin.php
@@ -120,17 +120,17 @@ protected function configureSideMenu(MenuItemInterface $menu, $action, AdminInte
         $id = $admin->getRequest()->get('id');
 
         $menu->addChild(
-            $this->trans('customer.sidemenu.link_customer_edit', [], 'SonataCustomerBundle'),
+            'customer.sidemenu.link_customer_edit',
             $admin->generateMenuUrl('edit', ['id' => $id])
         );
 
         $menu->addChild(
-            $this->trans('customer.sidemenu.link_address_list', [], 'SonataCustomerBundle'),
+            'customer.sidemenu.link_address_list',
             $admin->generateMenuUrl('sonata.customer.admin.address.list', ['id' => $id])
         );
 
         $menu->addChild(
-            $this->trans('customer.sidemenu.link_order_list', [], 'SonataCustomerBundle'),
+            'customer.sidemenu.link_order_list',
             $admin->generateMenuUrl('sonata.order.admin.order.list', ['id' => $id])
         );
     }

diff --git a/src/InvoiceBundle/Admin/InvoiceAdmin.php b/src/InvoiceBundle/Admin/InvoiceAdmin.php
@@ -45,21 +45,21 @@ public function configureFormFields(FormMapper $formMapper): void
     {
         if (!$this->isChild()) {
             $formMapper
-                ->with($this->trans('invoice.form.group_main_label', [], $this->translationDomain))
+                ->with('invoice.form.group_main_label')
                     ->add('customer', ModelListType::class)
                 ->end()
             ;
         }
 
         $formMapper
-            ->with($this->trans('invoice.form.group_main_label', [], $this->translationDomain))
+            ->with('invoice.form.group_main_label')
                 ->add('reference')
                 ->add('currency', CurrencyFormType::class)
                 ->add('status', InvoiceStatusType::class, ['translation_domain' => $this->translationDomain])
                 ->add('totalExcl')
                 ->add('totalInc')
             ->end()
-            ->with($this->trans('invoice.form.group_billing_label', [], $this->translationDomain), ['collapsed' => true])
+            ->with('invoice.form.group_billing_label', ['collapsed' => true])
                 ->add('name')
                 ->add('phone')
                 ->add('address1')

diff --git a/src/OrderBundle/Admin/OrderAdmin.php b/src/OrderBundle/Admin/OrderAdmin.php
@@ -75,29 +75,29 @@ public function configureFormFields(FormMapper $formMapper): void
     {
         // define group zoning
         $formMapper
-             ->with($this->trans('order.form.group_main_label'), ['class' => 'col-md-12'])->end()
-             ->with($this->trans('order.form.group_billing_label'), ['class' => 'col-md-6'])->end()
-             ->with($this->trans('order.form.group_shipping_label'), ['class' => 'col-md-6'])->end()
+             ->with('order.form.group_main_label', ['class' => 'col-md-12'])->end()
+             ->with('order.form.group_billing_label', ['class' => 'col-md-6'])->end()
+             ->with('order.form.group_shipping_label', ['class' => 'col-md-6'])->end()
         ;
 
         if (!$this->isChild()) {
             $formMapper
-                ->with($this->trans('order.form.group_main_label', [], 'SonataOrderBundle'))
+                ->with('order.form.group_main_label')
                     ->add('customer', ModelListType::class)
                 ->end()
             ;
         }
 
         $formMapper
-            ->with($this->trans('order.form.group_main_label', [], 'SonataOrderBundle'))
+            ->with('order.form.group_main_label')
                 ->add('currency', CurrencyFormType::class)
                 ->add('locale', LocaleType::class)
                 ->add('status', OrderStatusType::class, ['translation_domain' => 'SonataOrderBundle'])
                 ->add('paymentStatus', PaymentTransactionStatusType::class, ['translation_domain' => 'SonataPaymentBundle'])
                 ->add('deliveryStatus', ProductDeliveryStatusType::class, ['translation_domain' => 'SonataDeliveryBundle'])
                 ->add('validatedAt', DatePickerType::class, ['dp_side_by_side' => true])
             ->end()
-            ->with($this->trans('order.form.group_billing_label', [], 'SonataOrderBundle'), ['collapsed' => true])
+            ->with('order.form.group_billing_label', ['collapsed' => true])
                 ->add('billingName')
                 ->add('billingAddress1')
                 ->add('billingAddress2')
@@ -109,7 +109,7 @@ public function configureFormFields(FormMapper $formMapper): void
                 ->add('billingEmail')
                 ->add('billingMobile')
             ->end()
-            ->with($this->trans('order.form.group_shipping_label', [], 'SonataOrderBundle'), ['collapsed' => true])
+            ->with('order.form.group_shipping_label', ['collapsed' => true])
                 ->add('shippingName')
                 ->add('shippingAddress1')
                 ->add('shippingAddress2')
@@ -184,12 +184,12 @@ protected function configureSideMenu(MenuItemInterface $menu, $action, AdminInte
         $id = $admin->getRequest()->get('id');
 
         $menu->addChild(
-            $this->trans('sonata.order.sidemenu.link_order_edit', [], 'SonataOrderBundle'),
+            'sonata.order.sidemenu.link_order_edit',
             ['uri' => $admin->generateUrl('edit', ['id' => $id])]
         );
 
         $menu->addChild(
-            $this->trans('sonata.order.sidemenu.link_order_elements_list', [], 'SonataOrderBundle'),
+            'sonata.order.sidemenu.link_order_elements_list',
             ['uri' => $admin->generateUrl('sonata.order.admin.order_element.list', ['id' => $id])]
         );
 
@@ -198,12 +198,12 @@ protected function configureSideMenu(MenuItemInterface $menu, $action, AdminInte
 
         if (null === $invoice) {
             $menu->addChild(
-                $this->trans('sonata.order.sidemenu.link_oRDER_TO_INVOICE_generate', [], 'SonataOrderBundle'),
+                'sonata.order.sidemenu.link_oRDER_TO_INVOICE_generate',
                 ['uri' => $admin->generateUrl('generateInvoice', ['id' => $id])]
             );
         } else {
             $menu->addChild(
-                $this->trans('sonata.order.sidemenu.link_oRDER_TO_INVOICE_edit', [], 'SonataOrderBundle'),
+                'sonata.order.sidemenu.link_oRDER_TO_INVOICE_edit',
                 ['uri' => $this->getConfigurationPool()->getAdminByAdminCode('sonata.invoice.admin.invoice')->generateUrl('edit', ['id' => $invoice->getId()])]
             );
         }

diff --git a/src/OrderBundle/Admin/OrderElementAdmin.php b/src/OrderBundle/Admin/OrderElementAdmin.php
@@ -58,7 +58,7 @@ public function configureFormFields(FormMapper $formMapper): void
         ];
 
         $formMapper
-            ->with($this->trans('order_element.form.group_main_label', [], 'SonataOrderBundle'))
+            ->with('order_element.form.group_main_label')
                 ->add('productType', ChoiceType::class, $productTypeOptions)
                 ->add('quantity')
                 ->add('price')

diff --git a/src/ProductBundle/Admin/DeliveryAdmin.php b/src/ProductBundle/Admin/DeliveryAdmin.php
@@ -79,7 +79,7 @@ protected function configureSideMenu(MenuItemInterface $menu, $action, AdminInte
         $id = $admin->getRequest()->get('id');
 
         $menu->addChild(
-            $this->trans('product.sidemenu.link_product_edit', [], 'SonataProductBundle'),
+            'product.sidemenu.link_product_edit',
             ['uri' => $admin->generateUrl('edit', ['id' => $id])]
         );
     }

diff --git a/src/ProductBundle/Admin/ProductAdmin.php b/src/ProductBundle/Admin/ProductAdmin.php
@@ -192,28 +192,28 @@ protected function configureSideMenu(MenuItemInterface $menu, $action, AdminInte
         $product = $this->getObject($id);
 
         $menu->addChild(
-            $this->trans('product.sidemenu.link_product_edit', [], 'SonataProductBundle'),
+            'product.sidemenu.link_product_edit',
             ['uri' => $admin->generateUrl('edit', ['id' => $id])]
         );
 
         $menu->addChild(
-            $this->trans('product.sidemenu.view_categories', [], 'SonataProductBundle'),
+            'product.sidemenu.view_categories',
             ['uri' => $admin->generateUrl('sonata.product.admin.product.category.list', ['id' => $id])]
         );
 
         $menu->addChild(
-            $this->trans('product.sidemenu.view_collections', [], 'SonataProductBundle'),
+            'product.sidemenu.view_collections',
             ['uri' => $admin->generateUrl('sonata.product.admin.product.collection.list', ['id' => $id])]
         );
 
         $menu->addChild(
-            $this->trans('product.sidemenu.view_deliveries', [], 'SonataProductBundle'),
+            'product.sidemenu.view_deliveries',
             ['uri' => $admin->generateUrl('sonata.product.admin.delivery.list', ['id' => $id])]
         );
 
         if (!$product->isVariation() && 'sonata.product.admin.product' === $this->getCode()) {
             $menu->addChild(
-                $this->trans('product.sidemenu.view_variations'),
+                'product.sidemenu.view_variations',
                 ['uri' => $admin->generateUrl('sonata.product.admin.product.variation.list', ['id' => $id])]
             );
         }

diff --git a/src/ProductBundle/Admin/ProductCategoryAdmin.php b/src/ProductBundle/Admin/ProductCategoryAdmin.php
@@ -80,7 +80,7 @@ protected function configureSideMenu(MenuItemInterface $menu, $action, AdminInte
         $id = $admin->getRequest()->get('id');
 
         $menu->addChild(
-            $this->trans('product.sidemenu.link_product_edit', [], 'SonataProductBundle'),
+            'product.sidemenu.link_product_edit',
             ['uri' => $admin->generateUrl('edit', ['id' => $id])]
         );
     }

diff --git a/src/ProductBundle/Admin/ProductCollectionAdmin.php b/src/ProductBundle/Admin/ProductCollectionAdmin.php
@@ -79,7 +79,7 @@ protected function configureSideMenu(MenuItemInterface $menu, $action, AdminInte
         $id = $admin->getRequest()->get('id');
 
         $menu->addChild(
-            $this->trans('product.sidemenu.link_product_edit', [], 'SonataProductBundle'),
+            'product.sidemenu.link_product_edit',
             ['uri' => $admin->generateUrl('edit', ['id' => $id])]
         );
     }

diff --git a/src/ProductBundle/Admin/ProductVariationAdmin.php b/src/ProductBundle/Admin/ProductVariationAdmin.php
@@ -97,18 +97,18 @@ protected function configureSideMenu(MenuItemInterface $menu, $action, AdminInte
         $product = $this->getObject($id);
 
         $menu->addChild(
-            $this->trans('product.sidemenu.link_product_edit', [], 'SonataProductBundle'),
+            'product.sidemenu.link_product_edit',
             ['uri' => $admin->generateUrl('edit', ['id' => $id])]
         );
 
         if (!$product->isVariation() && 'sonata.product.admin.product' === $this->getCode()) {
             $menu->addChild(
-                $this->trans('product.sidemenu.link_add_variation', [], 'SonataProductBundle'),
+                'product.sidemenu.link_add_variation',
                 ['uri' => $admin->generateUrl('sonata.product.admin.product.variation.create', ['id' => $id])]
             );
 
             $menu->addChild(
-                $this->trans('product.sidemenu.view_variations'),
+                'product.sidemenu.view_variations',
                 ['uri' => $admin->generateUrl('sonata.product.admin.product.variation.list', ['id' => $id])]
             );
         }