Skip to content

Commit d92d9a3

Browse files
bastianschwarzbastianschwarz
authored
Merge pull request #4 from codenamephp/dependabot/composer/deployer/deployer-7.0.0
Update deployer/deployer requirement from 7.0.0-rc.4 to 7.0.0
2 parents 8bb36cd + 641eafa commit d92d9a3

24 files changed

Lines changed: 75462 additions & 73095 deletions

‎.idea/deployer.base.iml‎

Lines changed: 9 additions & 26 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/php.xml‎

Lines changed: 8 additions & 24 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎MIGRATION.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# Migration
2+
3+
## 1.x -> 2.x
4+
5+
The ssh connection string is now part of `\Deployer\Host\Host`. This means the
6+
`\de\codenamephp\deployer\base\ssh\client\iClient` interface and the `\de\codenamephp\deployer\base\ssh\client\StaticProxy` implementation
7+
are not needed anymore and were removed. Just call `\Deployer\Host\Host::connectionOptionsString` directly
8+
and remove any usages to the removed classes and interfaces.

‎composer.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
],
1212
"require": {
1313
"php": "^8.1",
14-
"deployer/deployer": "7.0.0-rc.4"
14+
"deployer/deployer": "7.0.0",
15+
"symfony/console": "^6.1"
1516
},
1617
"require-dev": {
1718
"roave/security-advisories": "dev-latest"
@@ -37,7 +38,7 @@
3738
"phive-update": "XDEBUG_MODE=off phive update && git add tools/* phive.xml && git commit -m 'Updated phive dependencies'",
3839
"phpunit": "XDEBUG_MODE=coverage tools/phpunit.phar -c test/phpunit.dist.xml test/",
3940
"psalm": "XDEBUG_MODE=off tools/psalm --threads=10 --long-progress --no-diff",
40-
"composer-unused": "XDEBUG_MODE=off tools/composer-unused --no-progress --no-interaction",
41+
"composer-unused": "XDEBUG_MODE=off tools/composer-unused.phar --no-progress --no-interaction --excludePackage=deployer/deployer",
4142
"composer-require-checker": "XDEBUG_MODE=off tools/composer-require-checker --no-interaction",
4243
"infection": "XDEBUG_MODE=coverage tools/infection --min-msi=100 --min-covered-msi=100 --threads=4 --no-progress --show-mutations",
4344
"ci-all": [

‎deployer.phar‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
vendor/deployer/deployer/dep

‎infection.json.dist‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,6 @@
1717
},
1818
"mutators": {
1919
"@default": true
20-
}
20+
},
21+
"bootstrap":"./test/bootstrap.php"
2122
}

‎phive.xml‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,9 @@
1515
~ limitations under the License.
1616
-->
1717
<phive xmlns="https://phar.io/phive">
18-
<phar name="phpunit" version="^9.5" installed="9.5.13" location="./tools/phpunit.phar" copy="true"/>
19-
<phar name="psalm" version="^4.20" installed="4.20.0" location="./tools/psalm" copy="true"/>
20-
<phar name="composer-unused" version="^0.7" installed="0.7.12" location="./tools/composer-unused" copy="true"/>
21-
<phar name="composer-require-checker" version="^2.1.0" installed="2.1.0" location="./tools/composer-require-checker" copy="true"/>
22-
<phar name="infection" version="^0.26" installed="0.26.4" location="./tools/infection" copy="true"/>
23-
<phar name="php-cs-fixer" version="^2.19" installed="2.19.3" location="./tools/php-cs-fixer" copy="true"/>
18+
<phar name="phpunit" version="^9.5" installed="9.5.21" location="./tools/phpunit.phar" copy="true"/>
19+
<phar name="psalm" version="^4.20" installed="4.25.0" location="./tools/psalm" copy="true"/>
20+
<phar name="composer-unused" version="^0.8" installed="0.8.2" location="./tools/composer-unused.phar" copy="true"/>
21+
<phar name="composer-require-checker" version="^4.1.0" installed="4.1.0" location="./tools/composer-require-checker" copy="true"/>
22+
<phar name="infection" version="^0.26" installed="0.26.13" location="./tools/infection" copy="true"/>
2423
</phive>

‎psalm.xml‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,21 +17,20 @@
1717

1818
<psalm
1919
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
20-
totallyTyped="true"
2120
xmlns="https://getpsalm.org/schema/config"
2221
xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
2322
cacheDirectory=".cache/psalm"
2423
errorLevel="1"
24+
autoloader="./test/bootstrap.php"
2525
>
26-
<projectFiles>
27-
<directory name="src"/>
28-
<ignoreFiles>
29-
<directory name="vendor"/>
30-
</ignoreFiles>
31-
</projectFiles>
26+
<projectFiles>
27+
<directory name="src"/>
28+
<ignoreFiles>
29+
<directory name="vendor"/>
30+
</ignoreFiles>
31+
</projectFiles>
3232

33-
<issueHandlers>
34-
<MissingConstructor errorLevel="suppress"/>
35-
<PropertyNotSetInConstructor errorLevel="suppress"/>
36-
</issueHandlers>
33+
<stubs>
34+
<file name="vendor/deployer/deployer/src/functions.php"/>
35+
</stubs>
3736
</psalm>

‎src/functions/iAfter.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ interface iAfter {
2828
* Call that task after specified task runs.
2929
*
3030
* @param string $task The task after $do should be run.
31-
* @param \de\codenamephp\deployer\base\task\iTask|string|callable $do The task to be run.
31+
* @param \de\codenamephp\deployer\base\task\iTask|string|callable():void $do The task to be run.
3232
*
3333
* @return Task|null
3434
*/

‎src/functions/iTask.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ interface iTask {
3131
* Alternatively get a defined task.
3232
*
3333
* @param string $name Name of current task.
34-
* @param \de\codenamephp\deployer\base\task\iTask|callable|array|null $body Callable task, array of other tasks names or nothing to get a defined tasks
34+
* @param \de\codenamephp\deployer\base\task\iTask|callable():void|array|null $body Callable task, array of other tasks names or nothing to get a defined tasks
3535
*/
3636
public function task(string $name, \de\codenamephp\deployer\base\task\iTask|callable|array|null $body = null) : Task;
3737

0 commit comments

Comments
 (0)