1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
|
diff -up ./bin/phpcompatinfo.rpm ./bin/phpcompatinfo
--- ./bin/phpcompatinfo.rpm 2021-04-12 09:54:09.000000000 +0200
+++ ./bin/phpcompatinfo 2021-04-13 10:41:27.780928446 +0200
@@ -8,12 +8,12 @@ if (PHP_SAPI !== 'cli') {
gc_disable(); // performance boost
-require_once dirname(__DIR__) . '/config/bootstrap.php';
+require_once '/usr/share/php/Bartlett/CompatInfo/config/bootstrap.php';
use Bartlett\CompatInfo\Console\ApplicationInterface;
/** @var \Symfony\Component\DependencyInjection\ContainerBuilder $container */
-$container = require dirname(__DIR__) . '/config/container.php';
+$container = require '/usr/share/php/Bartlett/CompatInfo/config/container.php';
$app = $container->get(ApplicationInterface::class);
$app->setContainer($container);
diff -up ./config/bootstrap.php.rpm ./config/bootstrap.php
--- ./config/bootstrap.php.rpm 2021-04-12 09:54:09.000000000 +0200
+++ ./config/bootstrap.php 2021-04-13 10:41:27.780928446 +0200
@@ -6,6 +6,8 @@ if (\Phar::running()) {
];
} else {
$possibleAutoloadPaths = [
+ // RPM
+ __DIR__ . '/../autoload.php',
// local dev repository
__DIR__ . '/../vendor/autoload.php',
// dependency
diff -up ./config/set/default.php.rpm ./config/set/default.php
--- ./config/set/default.php.rpm 2021-04-12 09:54:09.000000000 +0200
+++ ./config/set/default.php 2021-04-13 10:41:27.780928446 +0200
@@ -33,7 +33,7 @@ use function Symfony\Component\Dependenc
*/
return static function (ContainerConfigurator $containerConfigurator): void
{
- $containerConfigurator->import(dirname(__DIR__,2) . '/vendor/bartlett/php-compatinfo-db/config/set/default.php');
+ $containerConfigurator->import('/usr/share/php/Bartlett/CompatInfoDb/config/set/default.php');
$containerConfigurator->import(__DIR__ . '/common.php');
$parameters = $containerConfigurator->parameters();
diff -up ./src/Bartlett/CompatInfo/Console/Application.php.rpm ./src/Bartlett/CompatInfo/Console/Application.php
--- ./src/Bartlett/CompatInfo/Console/Application.php.rpm 2021-04-12 09:54:09.000000000 +0200
+++ ./src/Bartlett/CompatInfo/Console/Application.php 2021-04-13 10:41:27.780928446 +0200
@@ -30,8 +30,6 @@ use Symfony\Component\DependencyInjectio
use Symfony\Component\EventDispatcher\EventDispatcher;
use Symfony\Component\EventDispatcher\EventDispatcherInterface ;
-use PackageVersions\Versions;
-
use Phar;
use function substr_count;
@@ -78,14 +76,6 @@ class Application extends BaseApplicatio
$version = self::VERSION;
} elseif (substr_count($version, '.') === 2) {
// release is in X.Y.Z format
- } else {
- // composer or git strategy
- $version = Versions::getVersion('bartlett/php-compatinfo');
- list($ver, ) = explode('@', $version);
-
- if (strpos($ver, 'dev') === false) {
- $version = $ver;
- }
}
parent::__construct(self::NAME, $version);
diff -up ./tests/Reference/ParameterTest.php.rpm ./tests/Reference/ParameterTest.php
--- ./tests/Reference/ParameterTest.php.rpm 2021-04-12 09:54:09.000000000 +0200
+++ ./tests/Reference/ParameterTest.php 2021-04-13 10:41:27.780928446 +0200
@@ -42,7 +42,7 @@ final class ParameterTest extends SniffT
*/
public function functionProvider()
{
- $container = require __DIR__ . '/../../config/container.php';
+ $container = require '@BUILDPATH@/config/container.php';
$repository = $container->get(FunctionRepository::class);
$functions = [];
foreach ($repository->getAll() as $function) {
diff -up ./tests/TestCase.php.rpm ./tests/TestCase.php
--- ./tests/TestCase.php.rpm 2021-04-13 10:41:27.780928446 +0200
+++ ./tests/TestCase.php 2021-04-13 10:43:04.778512016 +0200
@@ -46,7 +46,7 @@ abstract class TestCase extends \PHPUnit
*/
protected function executeAnalysis(string $dataSource): array
{
- $container = require __DIR__ . '/../config/container.php';
+ $container = require '@BUILDPATH@/config/container.php';
$references = $container->get(ReferenceCollectionInterface::class);
$sniffs = $container->get(SniffCollection::class);
|
