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 · ba30ef8 · ba30ef8
1 parent 64be4fb
commit ba30ef8
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 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/...ccessGiftSubscriptionAddressWidget/payment_success_gift_subscription_address_widget.latte b/...ccessGiftSubscriptionAddressWidget/payment_success_gift_subscription_address_widget.latte
@@ -21,7 +21,7 @@
 	<script type="text/javascript">
         $(function() {
             registerFormCallback(function() {
-                var $giftSubscriptionAddressForm = $("#{$control['giftSubscriptionAddressForm']->getElementPrototype()->id|noescape}");
+                var $giftSubscriptionAddressForm = $("#" + {$control['giftSubscriptionAddressForm']->getElementPrototype()->id|noescape});
                 if (!Nette.validateForm($giftSubscriptionAddressForm[0])) {
                     errorCallback();
                     return;
@@ -34,7 +34,7 @@
                     complete: function() {
                         // this case handles scenario when Nette.validateForm said all is fine, but successHandler
                         // on backend could have triggered an error anyway
-                        var giftSubscriptionFormSaved = $('#{$control["giftSubscriptionAddressForm"]["done"]->htmlId|noescape}').val() === "1";
+                        var giftSubscriptionFormSaved = $('#' + {$control["giftSubscriptionAddressForm"]["done"]->htmlId|noescape}).val() === "1";
                         if (!giftSubscriptionFormSaved) {
                             alert({_gifts.components.gift_subscription_address.need_to_fill});
                             errorCallback();
@@ -49,6 +49,6 @@
 	</script>
 
 	<script n:if="!$presenter->isAjax()">
-        $("#{$control['giftSubscriptionAddressForm']->getElementPrototype()->id|noescape}").hide();
+        $("#" + {$control['giftSubscriptionAddressForm']->getElementPrototype()->id|noescape}).hide();
 	</script>
 {/block}
diff --git a/src/DI/GiftsModuleExtension.php b/src/DI/GiftsModuleExtension.php
@@ -2,10 +2,10 @@
 
 namespace Crm\GiftsModule\DI;
 
-use Kdyby\Translation\DI\ITranslationProvider;
+use Contributte\Translation\DI\TranslationProviderInterface;
 use Nette\DI\CompilerExtension;
 
-class GiftsModuleExtension extends CompilerExtension implements ITranslationProvider
+class GiftsModuleExtension 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/Forms/GiftSubscriptionAddressFormFactory.php b/src/Forms/GiftSubscriptionAddressFormFactory.php
@@ -2,6 +2,7 @@
 
 namespace Crm\GiftsModule\Forms;
 
+use Contributte\Translation\Translator;
 use Crm\ApplicationModule\DataProvider\DataProviderManager;
 use Crm\GiftsModule\Seeders\AddressTypesSeeder;
 use Crm\PaymentsModule\Repository\PaymentMetaRepository;
@@ -11,7 +12,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 Tomaj\Form\Renderer\BootstrapRenderer;

diff --git a/src/Tests/BaseTestCase.php b/src/Tests/BaseTestCase.php
@@ -2,6 +2,7 @@
 
 namespace Crm\GiftsModule\Tests;
 
+use Contributte\Translation\Translator;
 use Crm\ApplicationModule\Tests\DatabaseTestCase;
 use Crm\GiftsModule\GiftsModule;
 use Crm\PaymentsModule\Repository\PaymentGatewaysRepository;
@@ -21,7 +22,6 @@
 use Crm\UsersModule\Repository\LoginAttemptsRepository;
 use Crm\UsersModule\Repository\UsersRepository;
 use Crm\UsersModule\Tests\TestNotificationHandler;
-use Kdyby\Translation\Translator;
 use League\Event\Emitter;
 
 abstract class BaseTestCase extends DatabaseTestCase