From 3142f44e5211b33e3b7cc0ccdc187789c0c3da6b Mon Sep 17 00:00:00 2001
From: Bastian Schwarz <bastian@codename-php.de>
Date: Sun, 31 Jul 2022 13:01:38 +0200
Subject: [PATCH 1/2] Updated deployer and deployer base versions. The version
 for deployer.base was changed to 2.0 and not extended since we directly
 depend on deployer where we want the release version so there would be no
 possible 1.0 combination to install

Signed-off-by: Bastian Schwarz <bastian@codename-php.de>
---
 .idea/deployer.command.iml | 19 +------------------
 .idea/php.xml              | 19 +------------------
 composer.json              |  4 ++--
 deployer.phar              |  1 +
 psalm.xml                  | 24 ++++++++++++++----------
 5 files changed, 19 insertions(+), 48 deletions(-)
 create mode 120000 deployer.phar

diff --git a/.idea/deployer.command.iml b/.idea/deployer.command.iml
index 63dbcf8..e478dea 100644
--- a/.idea/deployer.command.iml
+++ b/.idea/deployer.command.iml
@@ -8,32 +8,15 @@
       <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/polyfill-intl-grapheme" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/deprecation-contracts" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/string" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/evenement/evenement" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/deployer/deployer" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/justinrainbow/json-schema" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/psr/container" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/psr/http-message" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/codenamephp/deployer.base" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/react/http" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/polyfill-intl-normalizer" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/ringcentral/psr7" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/react/dns" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/polyfill-mbstring" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/react/promise-timer" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/console" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/react/cache" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/polyfill-php80" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/react/promise" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/service-contracts" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/react/stream" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/polyfill-php73" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/react/socket" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/polyfill-ctype" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/react/promise-stream" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/process" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/react/event-loop" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/yaml" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/fig/http-message-util" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/polyfill-php80" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
diff --git a/.idea/php.xml b/.idea/php.xml
index 4096d45..8909380 100644
--- a/.idea/php.xml
+++ b/.idea/php.xml
@@ -6,32 +6,15 @@
       <path value="$PROJECT_DIR$/vendor/symfony/polyfill-intl-grapheme" />
       <path value="$PROJECT_DIR$/vendor/symfony/deprecation-contracts" />
       <path value="$PROJECT_DIR$/vendor/symfony/string" />
-      <path value="$PROJECT_DIR$/vendor/evenement/evenement" />
       <path value="$PROJECT_DIR$/vendor/deployer/deployer" />
-      <path value="$PROJECT_DIR$/vendor/justinrainbow/json-schema" />
       <path value="$PROJECT_DIR$/vendor/psr/container" />
-      <path value="$PROJECT_DIR$/vendor/psr/http-message" />
       <path value="$PROJECT_DIR$/vendor/codenamephp/deployer.base" />
-      <path value="$PROJECT_DIR$/vendor/react/http" />
       <path value="$PROJECT_DIR$/vendor/symfony/polyfill-intl-normalizer" />
-      <path value="$PROJECT_DIR$/vendor/ringcentral/psr7" />
-      <path value="$PROJECT_DIR$/vendor/react/dns" />
       <path value="$PROJECT_DIR$/vendor/symfony/polyfill-mbstring" />
-      <path value="$PROJECT_DIR$/vendor/react/promise-timer" />
       <path value="$PROJECT_DIR$/vendor/symfony/console" />
-      <path value="$PROJECT_DIR$/vendor/react/cache" />
-      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-php80" />
-      <path value="$PROJECT_DIR$/vendor/react/promise" />
       <path value="$PROJECT_DIR$/vendor/symfony/service-contracts" />
-      <path value="$PROJECT_DIR$/vendor/react/stream" />
-      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-php73" />
-      <path value="$PROJECT_DIR$/vendor/react/socket" />
       <path value="$PROJECT_DIR$/vendor/symfony/polyfill-ctype" />
-      <path value="$PROJECT_DIR$/vendor/react/promise-stream" />
-      <path value="$PROJECT_DIR$/vendor/symfony/process" />
-      <path value="$PROJECT_DIR$/vendor/react/event-loop" />
-      <path value="$PROJECT_DIR$/vendor/symfony/yaml" />
-      <path value="$PROJECT_DIR$/vendor/fig/http-message-util" />
+      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-php80" />
     </include_path>
   </component>
   <component name="PhpInterpreters">
diff --git a/composer.json b/composer.json
index c8cacff..380fa99 100644
--- a/composer.json
+++ b/composer.json
@@ -11,8 +11,8 @@
   ],
   "require": {
     "php": "^8.1",
-    "deployer/deployer": "7.0.0-rc.4",
-    "codenamephp/deployer.base": "^1.0"
+    "deployer/deployer": "7.0.0",
+    "codenamephp/deployer.base": "^2.0"
   },
   "require-dev": {
     "roave/security-advisories": "dev-latest"
diff --git a/deployer.phar b/deployer.phar
new file mode 120000
index 0000000..20277de
--- /dev/null
+++ b/deployer.phar
@@ -0,0 +1 @@
+vendor/deployer/deployer/dep
\ No newline at end of file
diff --git a/psalm.xml b/psalm.xml
index b4df064..3f121a2 100644
--- a/psalm.xml
+++ b/psalm.xml
@@ -21,15 +21,19 @@
   xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
   cacheDirectory=".cache/psalm"
 >
-    <projectFiles>
-        <directory name="src"/>
-        <ignoreFiles>
-            <directory name="vendor"/>
-        </ignoreFiles>
-    </projectFiles>
+  <projectFiles>
+    <directory name="src"/>
+    <ignoreFiles>
+      <directory name="vendor"/>
+    </ignoreFiles>
+  </projectFiles>
 
-    <issueHandlers>
-        <MissingConstructor errorLevel="suppress"/>
-        <PropertyNotSetInConstructor errorLevel="suppress"/>
-    </issueHandlers>
+  <extraFiles>
+    <directory name="vendor/deployer/deployer/src/"/>
+  </extraFiles>
+
+  <issueHandlers>
+    <MissingConstructor errorLevel="suppress"/>
+    <PropertyNotSetInConstructor errorLevel="suppress"/>
+  </issueHandlers>
 </psalm>

From 7c73615726049419516844b38599fa7497dc0378 Mon Sep 17 00:00:00 2001
From: Bastian Schwarz <bastian@codename-php.de>
Date: Sun, 31 Jul 2022 13:03:02 +0200
Subject: [PATCH 2/2] Use caret instead of direct version ... oof

Signed-off-by: Bastian Schwarz <bastian@codename-php.de>
---
 .idea/deployer.command.iml | 1 -
 .idea/php.xml              | 1 -
 composer.json              | 2 +-
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/.idea/deployer.command.iml b/.idea/deployer.command.iml
index e478dea..698d58e 100644
--- a/.idea/deployer.command.iml
+++ b/.idea/deployer.command.iml
@@ -16,7 +16,6 @@
       <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/console" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/service-contracts" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/polyfill-ctype" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/polyfill-php80" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
diff --git a/.idea/php.xml b/.idea/php.xml
index 8909380..2179e65 100644
--- a/.idea/php.xml
+++ b/.idea/php.xml
@@ -14,7 +14,6 @@
       <path value="$PROJECT_DIR$/vendor/symfony/console" />
       <path value="$PROJECT_DIR$/vendor/symfony/service-contracts" />
       <path value="$PROJECT_DIR$/vendor/symfony/polyfill-ctype" />
-      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-php80" />
     </include_path>
   </component>
   <component name="PhpInterpreters">
diff --git a/composer.json b/composer.json
index 380fa99..0f39ee3 100644
--- a/composer.json
+++ b/composer.json
@@ -11,7 +11,7 @@
   ],
   "require": {
     "php": "^8.1",
-    "deployer/deployer": "7.0.0",
+    "deployer/deployer": "^7.0",
     "codenamephp/deployer.base": "^2.0"
   },
   "require-dev": {