Skip to content

Commit

Permalink
Isolating bin dependencies.
Browse files Browse the repository at this point in the history
  • Loading branch information
oleg-andreyev committed Oct 24, 2023
1 parent f549108 commit ce3595e
Show file tree
Hide file tree
Showing 12 changed files with 5,722 additions and 11 deletions.
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ phpcs.xml.dist export-ignore
psalm.xml.dist export-ignore
/Resources/doc export-ignore
/Tests export-ignore
/vendor-bin/**/composer.lock binary
5 changes: 5 additions & 0 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,11 @@ jobs:
ini-values: "zend.assertions=1"
extensions: "pdo_sqlite"

- name: Install dependencies
run: |
composer update
composer bin all install
- name: "Globally install symfony/flex"
run: "composer require --no-progress --no-scripts --no-plugins symfony/flex"

Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,5 @@ phpunit.xml
/.phpunit.result.cache
/phpcs.xml
/.phpcs-cache
/vendor-bin/**/vendor/
!/vendor-bin/**/composer.lock
2 changes: 1 addition & 1 deletion Tests/bootstrap.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@

use Doctrine\Deprecations\Deprecation;

require_once 'vendor/autoload.php';
require_once __DIR__ . '/../vendor-bin/phpunit/autoload.php';

Deprecation::enableWithTriggerError();
19 changes: 12 additions & 7 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,16 +44,13 @@
"symfony/service-contracts": "^1.1.1 || ^2.0 || ^3"
},
"require-dev": {
"bamarni/composer-bin-plugin": "^1.5",
"doctrine/annotations": "^1 || ^2",
"doctrine/coding-standard": "^9.0",
"doctrine/deprecations": "^1.0",
"doctrine/orm": "^2.14 || ^3.0",
"friendsofphp/proxy-manager-lts": "^1.0",
"phpunit/phpunit": "^9.5.26 || ^10.0",
"psalm/plugin-phpunit": "^0.18.4",
"psalm/plugin-symfony": "^4",
"psr/log": "^1.1.4 || ^2.0 || ^3.0",
"symfony/phpunit-bridge": "^6.1",
"symfony/property-info": "^5.4 || ^6.0",
"symfony/proxy-manager-bridge": "^5.4 || ^6.0",
"symfony/security-bundle": "^5.4 || ^6.0",
Expand All @@ -63,8 +60,7 @@
"symfony/var-exporter": "^5.4 || ^6.2 || ^7.0",
"symfony/web-profiler-bundle": "^5.4 || ^6.0",
"symfony/yaml": "^5.4 || ^6.0",
"twig/twig": "^1.34 || ^2.12 || ^3.0",
"vimeo/psalm": "^4.30"
"twig/twig": "^1.34 || ^2.12 || ^3.0"
},
"conflict": {
"doctrine/annotations": ">=3.0",
Expand All @@ -91,11 +87,20 @@
"allow-plugins": {
"composer/package-versions-deprecated": true,
"dealerdirect/phpcodesniffer-composer-installer": true,
"symfony/flex": true
"symfony/flex": true,
"bamarni/composer-bin-plugin": true
},
"extra": {
"bamarni-bin": {
"bin-links": true,
"target-directory": "vendor-bin",
"forward-command": true
}
},
"sort-packages": true
},
"scripts": {
"bin": "echo 'bin not installed'",
"auto-scripts": {
"cache:clear": "symfony-cmd",
"assets:install %PUBLIC_DIR%": "symfony-cmd"
Expand Down
8 changes: 5 additions & 3 deletions psalm.xml.dist
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,16 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="https://getpsalm.org/schema/config"
xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
autoloader="vendor-bin/psalm/autoload.php"
>
<plugins>
<pluginClass class="Psalm\SymfonyPsalmPlugin\Plugin"/>
<pluginClass class="Psalm\PhpUnitPlugin\Plugin"/>
</plugins>

<pluginClass class="Psalm\PhpUnitPlugin\Plugin"/></plugins>
<projectFiles>
<ignoreFiles>
<directory name="vendor"/>
<directory name="vendor-bin/"/>
<!-- Deprecated classes, not worth fixing -->
<file name="Command/ImportMappingDoctrineCommand.php"/>
<file name="Command/Proxy/OrmProxyCommand.php"/>
Expand Down Expand Up @@ -58,7 +60,7 @@
<UndefinedDocblockClass>
<errorLevel type="suppress">
<!-- https://github.com/symfony/symfony/issues/45609 -->
<referencedClass name="UnitEnum" />
<referencedClass name="UnitEnum"/>
<directory name="DependencyInjection"/>
<directory name="Tests/DependencyInjection"/>
</errorLevel>
Expand Down
4 changes: 4 additions & 0 deletions vendor-bin/phpunit/autoload.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<?php

require_once __DIR__ . '/vendor/autoload.php';
require_once __DIR__ . '/../../vendor/autoload.php';
6 changes: 6 additions & 0 deletions vendor-bin/phpunit/composer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"require-dev": {
"phpunit/phpunit": "^9.5.26",
"symfony/phpunit-bridge": "^6.1"
}
}
Loading

0 comments on commit ce3595e

Please sign in to comment.