Upgrade to PHP 8.0, upgrade to Deployer 7

- new deploy strategy, project is copied to application servers instead of using NFS remp/crm#2519
remp2020 · Aug 25, 2022 · 3de6c17 · 3de6c17
1 parent 8ebc020
commit 3de6c17
Show file tree

Hide file tree

Showing 18 changed files with 30 additions and 30 deletions.
diff --git a/composer.json b/composer.json
@@ -5,7 +5,7 @@
   "homepage": "https://remp2020.com",
   "license": "MIT",
   "require": {
-    "php": "^7.4"
+    "php": "^8.0"
   },
   "minimum-stability": "dev",
   "autoload": {

diff --git a/src/DI/ProductsModuleExtension.php b/src/DI/ProductsModuleExtension.php
@@ -2,10 +2,10 @@
 
 namespace Crm\ProductsModule\DI;
 
-use Kdyby\Translation\DI\ITranslationProvider;
+use Contributte\Translation\DI\TranslationProviderInterface;
 use Nette\DI\CompilerExtension;
 
-class ProductsModuleExtension extends CompilerExtension implements ITranslationProvider
+class ProductsModuleExtension extends CompilerExtension implements TranslationProviderInterface
 {
     private $defaults = [];
 
@@ -32,7 +32,7 @@ public function beforeCompile()
      * Return array of directories, that contain resources for translator.
      * @return string[]
      */
-    public function getTranslationResources()
+    public function getTranslationResources(): array
     {
         return [__DIR__ . '/../lang/'];
     }

diff --git a/src/DataProviders/PaymentFormDataProvider.php b/src/DataProviders/PaymentFormDataProvider.php
@@ -11,10 +11,10 @@
 use Crm\ProductsModule\PaymentItem\ProductPaymentItem;
 use Crm\ProductsModule\Repository\PostalFeesRepository;
 use Crm\ProductsModule\Repository\ProductsRepository;
-use Kdyby\Translation\ITranslator;
 use League\Event\Emitter;
 use Nette\Application\UI\Form;
 use Nette\Database\Table\ActiveRow;
+use Nette\Localization\Translator;
 use Nette\Utils\Json;
 
 class PaymentFormDataProvider implements PaymentFormDataProviderInterface
@@ -37,7 +37,7 @@ public function __construct(
         PaymentsRepository $paymentsRepository,
         PostalFeesRepository $postalFeesRepository,
         Emitter $emitter,
-        ITranslator $translator
+        Translator $translator
     ) {
         $this->productsRepository = $productsRepository;
         $this->paymentItemsRepository = $paymentItemsRepository;

diff --git a/src/Forms/CheckoutFormFactory.php b/src/Forms/CheckoutFormFactory.php
@@ -2,6 +2,7 @@
 
 namespace Crm\ProductsModule\Forms;
 
+use Contributte\Translation\Translator;
 use Crm\ApplicationModule\Config\ApplicationConfig;
 use Crm\ApplicationModule\DataProvider\DataProviderManager;
 use Crm\PaymentsModule\DataProvider\CheckoutFormDataProviderInterface;
@@ -25,7 +26,6 @@
 use Crm\UsersModule\Repository\AddressesRepository;
 use Crm\UsersModule\Repository\CountriesRepository;
 use Crm\UsersModule\Repository\UsersRepository;
-use Kdyby\Translation\Translator;
 use Nette\Application\UI\Form;
 use Nette\Database\Table\ActiveRow;
 use Nette\Forms\Controls\TextInput;

diff --git a/src/Forms/CountryPostalFeesFormFactory.php b/src/Forms/CountryPostalFeesFormFactory.php
@@ -2,14 +2,14 @@
 
 namespace Crm\ProductsModule\Forms;
 
+use Contributte\Translation\Translator;
 use Crm\ApplicationModule\Helpers\PriceHelper;
 use Crm\ProductsModule\PostalFeeCondition\PostalFeeConditionInterface;
 use Crm\ProductsModule\PostalFeeCondition\PostalFeeService;
 use Crm\ProductsModule\Repository\CountryPostalFeeConditionsRepository;
 use Crm\ProductsModule\Repository\CountryPostalFeesRepository;
 use Crm\ProductsModule\Repository\PostalFeesRepository;
 use Crm\UsersModule\Repository\CountriesRepository;
-use Kdyby\Translation\Translator;
 use Nette\Application\UI\Form;
 
 class CountryPostalFeesFormFactory

diff --git a/src/Forms/ProductsFormFactory.php b/src/Forms/ProductsFormFactory.php
@@ -2,6 +2,7 @@
 
 namespace Crm\ProductsModule\Forms;
 
+use Contributte\Translation\Translator;
 use Crm\ApplicationModule\Config\ApplicationConfig;
 use Crm\ApplicationModule\DataProvider\DataProviderManager;
 use Crm\ProductsModule\Builder\ProductBuilder;
@@ -18,7 +19,6 @@
 use Crm\ProductsModule\Repository\ProductTemplatesRepository;
 use Crm\ProductsModule\Repository\ProductsRepository;
 use Crm\ProductsModule\Repository\TagsRepository;
-use Kdyby\Translation\Translator;
 use League\Event\Emitter;
 use Nette\Application\UI\Form;
 use Nette\Database\Table\ActiveRow;

diff --git a/src/Forms/TagsFormFactory.php b/src/Forms/TagsFormFactory.php
@@ -2,9 +2,9 @@
 
 namespace Crm\ProductsModule\Forms;
 
+use Contributte\Translation\Translator;
 use Crm\ProductsModule\Repository\TagsRepository;
 use Crm\ProductsModule\TagsCache;
-use Kdyby\Translation\Translator;
 use Nette\Application\UI\Form;
 use Nette\Utils\Html;
 use Nette\Utils\Strings;

diff --git a/src/Models/PostalFeeCondition/ProductSumCondition.php b/src/Models/PostalFeeCondition/ProductSumCondition.php
@@ -2,8 +2,8 @@
 
 namespace Crm\ProductsModule\PostalFeeCondition;
 
+use Contributte\Translation\Translator;
 use Crm\ProductsModule\Repository\ProductsRepository;
-use Kdyby\Translation\Translator;
 use Nette\Application\UI\Form;
 use Nette\ComponentModel\IComponent;
 use Nette\Forms\Controls\TextInput;

diff --git a/src/Models/PostalFeeCondition/UserSegmentCondition.php b/src/Models/PostalFeeCondition/UserSegmentCondition.php
@@ -2,9 +2,9 @@
 
 namespace Crm\ProductsModule\PostalFeeCondition;
 
+use Contributte\Translation\Translator;
 use Crm\SegmentModule\Repository\SegmentsRepository;
 use Crm\SegmentModule\SegmentFactoryInterface;
-use Kdyby\Translation\Translator;
 use Nette\ComponentModel\IComponent;
 use Nette\Forms\Controls\SelectBox;
 

diff --git a/src/ProductsModule.php b/src/ProductsModule.php
@@ -2,6 +2,7 @@
 
 namespace Crm\ProductsModule;
 
+use Contributte\Translation\Translator;
 use Crm\ApplicationModule\AssetsManager;
 use Crm\ApplicationModule\Commands\CommandsContainerInterface;
 use Crm\ApplicationModule\Config\ApplicationConfig;
@@ -34,7 +35,6 @@
 use Crm\ProductsModule\Scenarios\OrderStatusOnScenarioEnterCriteria;
 use Crm\ProductsModule\Seeders\AddressTypesSeeder;
 use Crm\ProductsModule\Seeders\ConfigsSeeder;
-use Kdyby\Translation\Translator;
 use League\Event\Emitter;
 use Nette\Application\Routers\Route;
 use Nette\Application\Routers\RouteList;

diff --git a/src/Scenarios/ActualOrderStatusCriteria.php b/src/Scenarios/ActualOrderStatusCriteria.php
@@ -2,10 +2,10 @@
 
 namespace Crm\ProductsModule\Scenarios;
 
+use Contributte\Translation\Translator;
 use Crm\ApplicationModule\Criteria\ScenarioParams\StringLabeledArrayParam;
 use Crm\ApplicationModule\Criteria\ScenariosCriteriaInterface;
 use Crm\ProductsModule\Repository\OrdersRepository;
-use Kdyby\Translation\Translator;
 use Nette\Database\Table\ActiveRow;
 use Nette\Database\Table\Selection;
 

diff --git a/src/Scenarios/HasProductWithDistributionCenterCriteria.php b/src/Scenarios/HasProductWithDistributionCenterCriteria.php
@@ -2,10 +2,10 @@
 
 namespace Crm\ProductsModule\Scenarios;
 
+use Contributte\Translation\Translator;
 use Crm\ApplicationModule\Criteria\ScenarioParams\StringLabeledArrayParam;
 use Crm\ApplicationModule\Criteria\ScenariosCriteriaInterface;
 use Crm\ProductsModule\Repository\DistributionCentersRepository;
-use Kdyby\Translation\Translator;
 use Nette\Database\Table\ActiveRow;
 use Nette\Database\Table\Selection;
 

diff --git a/src/Scenarios/HasProductWithTemplateNameCriteria.php b/src/Scenarios/HasProductWithTemplateNameCriteria.php
@@ -2,10 +2,10 @@
 
 namespace Crm\ProductsModule\Scenarios;
 
+use Contributte\Translation\Translator;
 use Crm\ApplicationModule\Criteria\ScenarioParams\StringLabeledArrayParam;
 use Crm\ApplicationModule\Criteria\ScenariosCriteriaInterface;
 use Crm\ProductsModule\Repository\ProductTemplatesRepository;
-use Kdyby\Translation\Translator;
 use Nette\Database\Table\ActiveRow;
 use Nette\Database\Table\Selection;
 

diff --git a/src/Scenarios/OrderStatusOnScenarioEnterCriteria.php b/src/Scenarios/OrderStatusOnScenarioEnterCriteria.php
@@ -2,12 +2,12 @@
 
 namespace Crm\ProductsModule\Scenarios;
 
+use Contributte\Translation\Translator;
 use Crm\ApplicationModule\Criteria\ScenarioParams\StringLabeledArrayParam;
 use Crm\ApplicationModule\Criteria\ScenariosCriteriaInterface;
 use Crm\ProductsModule\Repository\OrdersRepository;
 use Crm\ScenariosModule\Events\ConditionCheckException;
 use Crm\ScenariosModule\Scenarios\ScenariosTriggerCriteriaInterface;
-use Kdyby\Translation\Translator;
 use Nette\Database\Table\ActiveRow;
 use Nette\Database\Table\Selection;
 

diff --git a/src/Tests/ProductSumConditionTest.php b/src/Tests/ProductSumConditionTest.php
@@ -2,10 +2,10 @@
 
 namespace Crm\ProductsModule\Tests;
 
+use Contributte\Translation\Translator;
 use Crm\ApplicationModule\Tests\DatabaseTestCase;
 use Crm\ProductsModule\PostalFeeCondition\ProductSumCondition;
 use Crm\ProductsModule\Repository\ProductsRepository;
-use Kdyby\Translation\Translator;
 use Nette\Database\Table\ActiveRow;
 
 class ProductSumConditionTest extends DatabaseTestCase

diff --git a/src/templates/OrdersAdmin/new.latte b/src/templates/OrdersAdmin/new.latte
@@ -204,7 +204,7 @@
                             <div class="hidden-xs hidden-sm col-sm-4 text-right">{$paymentItem->amount|price}</div>
                             <div class="hidden-xs hidden-sm col-sm-4 text-right">{$paymentItem->count}</div>
                             <div class="col-sm-4 text-right">
-                                {var $amount += $paymentItem->amount * $paymentItem->count}
+                                {php $amount += $paymentItem->amount * $paymentItem->count}
                                 {$paymentItem->amount * $paymentItem->count|price}
                             </div>
                         </div>
@@ -217,7 +217,7 @@
                             <div class="hidden-xs hidden-sm col-sm-4 text-right">&nbsp</div>
                             <div class="hidden-xs hidden-sm col-sm-4 text-right">&nbsp</div>
                             <div class="col-sm-4 text-right">{$control['checkoutForm']['postal_fee']->items[$control['checkoutForm']['postal_fee']->value]->amount|price}</div>
-                            {var $amount += $control['checkoutForm']['postal_fee']->items[$control['checkoutForm']['postal_fee']->value]->amount}
+                            {php $amount += $control['checkoutForm']['postal_fee']->items[$control['checkoutForm']['postal_fee']->value]->amount}
                         </div>
 
                     </div>
@@ -249,7 +249,7 @@
     <script>
 		$(document).ready(function () {
             {ifset $control['checkoutForm']['shipping_address']}
-			$('#{$form['shipping_address']['country_id']->getHtmlId()|noescape}').on('change', function () {
+			$('#' + {$form['shipping_address']['country_id']->getHtmlId()}).on('change', function () {
 				$.nette.ext('loader', null);
 				$.nette.ajax({
 					type: 'GET',
@@ -267,7 +267,7 @@
 					url: {link postalFeeChange!},
 					data: {
 						'value': $(this).val(),
-						'shipping_address': { 'country_id': $('#{$form['shipping_address']['country_id']->getHtmlId()|noescape}').val() }
+						'shipping_address': { 'country_id': $('#' + {$form['shipping_address']['country_id']->getHtmlId()}).val() }
 					}
 				});
 			});

diff --git a/src/templates/Shop/cart.latte b/src/templates/Shop/cart.latte
@@ -108,7 +108,7 @@
                                 </div>
                             </div></div>
                         <div class="_total"><div class="_pad">
-                                {var $amount += ($product->price * $cartProducts[$product->id])}
+                                {php $amount += ($product->price * $cartProducts[$product->id])}
                                 {($product->price * $cartProducts[$product->id])|price}
                             </div></div>
                         <div class="_remove"><div class="_pad">

diff --git a/src/templates/Shop/checkout.latte b/src/templates/Shop/checkout.latte
@@ -245,7 +245,7 @@
                     <div class="hidden-xs hidden-sm col-sm-4 text-right">{$product->price|price}</div>
                     <div class="hidden-xs hidden-sm col-sm-4 text-right">{$cartProducts[$product->id]}</div>
                     <div class="col-sm-4 text-right">
-                        {var $amount += ($product->price * $cartProducts[$product->id])}
+                        {php $amount += ($product->price * $cartProducts[$product->id])}
                         {($product->price * $cartProducts[$product->id])|price}
                     </div>
                 </div>
@@ -272,7 +272,7 @@
                     <div class="hidden-xs hidden-sm col-sm-4 text-right">&nbsp</div>
                     <div class="hidden-xs hidden-sm col-sm-4 text-right">&nbsp</div>
                     <div class="col-sm-4 text-right">{$control['checkoutForm']['postal_fee']->items[$control['checkoutForm']['postal_fee']->value]->amount|price}</div>
-                    {var $amount += $control['checkoutForm']['postal_fee']->items[$control['checkoutForm']['postal_fee']->value]->amount}
+                    {php $amount += $control['checkoutForm']['postal_fee']->items[$control['checkoutForm']['postal_fee']->value]->amount}
                 </div>
             </div>
         </div>
@@ -298,9 +298,9 @@
     <script>
         $(document).ready(function () {
             {ifset $form['user']['password']}
-            if ($('#{$form['user']['password']->getHtmlId()|noescape}').hasClass('error')) {
+            if ($('#' + {$form['user']['password']->getHtmlId()}).hasClass('error')) {
                 $('#password').show();
-                $('#{$form['user']['password']->getHtmlId()|noescape}').focus();
+                $('#' + {$form['user']['password']->getHtmlId()}).focus();
                 $('.login-hide').hide();
             }
             {/ifset}
@@ -311,7 +311,7 @@
                 $.ajax({
                     method: 'POST',
                     url: '/api/v1/users/email',
-                    data: { email: $('#{$form['user']['email']->getHtmlId()|noescape}').val() },
+                    data: { email: $('#' + {$form['user']['email']->getHtmlId()}).val() },
                     timeout: 20000
                 }).done(function (response) {
                     callback(response);
@@ -336,7 +336,7 @@
 			    return $('#shipping-address');
 			}
 
-            $('#{$form['user']['email']->getHtmlId()|noescape}').change(function () {
+            $('#' + {$form['user']['email']->getHtmlId()}).change(function () {
                 checkEmail(function (response) {
                     if (response.status === 'error' && response.code === 'invalid_email') {
                         $('#email-help-block').show().closest('.form-group').addClass('has-error');
@@ -366,7 +366,7 @@
             });
 
             {ifset $control['checkoutForm']['shipping_address']}
-            var shippingCountry = $('#{$form['shipping_country_id']->getHtmlId()|noescape}');
+            var shippingCountry = $('#' + {$form['shipping_country_id']->getHtmlId()});
             shippingCountry.on('change', function () {
                 $.nette.ext('loader', null);
                 $.nette.ajax({