blob: 6626bdf4ebed314f281e8f9000259b810085ad2e (
plain)
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
|
diff -up ./bin/phpcompatinfo.rpm ./bin/phpcompatinfo
--- ./bin/phpcompatinfo.rpm 2020-10-01 11:23:52.000000000 +0200
+++ ./bin/phpcompatinfo 2020-10-02 12:29:00.346660651 +0200
@@ -5,22 +5,13 @@ if (PHP_SAPI !== 'cli') {
return;
}
-if (\Phar::running()) {
- $vendorDir = 'phar://phpcompatinfo.phar/vendor';
-} else {
- $baseDir = dirname(__DIR__);
- $vendorDir = $baseDir . '/vendor';
-
- if (!file_exists($vendorDir . '/autoload.php')) {
- $vendorDir = dirname(dirname($baseDir));
- }
-}
+$vendorDir = '/usr/share/php/Bartlett/CompatInfo';
require_once $vendorDir . '/autoload.php';
use Bartlett\CompatInfo\Console\ApplicationInterface;
/** @var \Symfony\Component\DependencyInjection\ContainerBuilder $container */
-$container = require dirname(__DIR__) . '/config/container.php';
+$container = require $vendorDir . '/config/container.php';
$app = $container->get(ApplicationInterface::class);
$app->setContainer($container);
diff -up ./src/Bartlett/CompatInfo/Console/Application.php.rpm ./src/Bartlett/CompatInfo/Console/Application.php
--- ./src/Bartlett/CompatInfo/Console/Application.php.rpm 2020-10-02 12:05:49.767768616 +0200
+++ ./src/Bartlett/CompatInfo/Console/Application.php 2020-10-02 12:10:02.129841590 +0200
@@ -30,8 +30,6 @@ use Symfony\Component\DependencyInjectio
use Symfony\Component\EventDispatcher\EventDispatcher;
use Symfony\Component\EventDispatcher\EventDispatcherInterface ;
-use PackageVersions\Versions;
-
use function substr_count;
/**
@@ -77,14 +75,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);
|
