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
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
|
diff -up ./bin/phpcompatinfo.json.dist.rpm ./bin/phpcompatinfo.json.dist
--- ./bin/phpcompatinfo.json.dist.rpm 2015-07-11 10:04:30.000000000 +0200
+++ ./bin/phpcompatinfo.json.dist 2015-07-13 09:06:15.108698079 +0200
@@ -6,6 +6,19 @@
}
],
"plugins": [
+ {
+ "name": "Cache",
+ "class": "Bartlett\\Reflect\\Plugin\\CachePlugin",
+ "options": {
+ "adapter": "DoctrineCacheAdapter",
+ "backend": {
+ "class": "Doctrine\\Common\\Cache\\FilesystemCache",
+ "args": [
+ "%{HOME}/.cache/php-reflect"
+ ]
+ }
+ }
+ }
],
"analysers" : [
],
diff -up ./bin/phpcompatinfo.rpm ./bin/phpcompatinfo
--- ./bin/phpcompatinfo.rpm 2015-07-11 10:04:30.000000000 +0200
+++ ./bin/phpcompatinfo 2015-07-13 09:06:15.114698099 +0200
@@ -1,23 +1,12 @@
#!/usr/bin/env php
<?php
$appName = 'phpCompatInfo';
+$vendorDir = '/usr/share/php';
-if (\Phar::running()) {
- $vendorDir = 'phar://' . strtolower($appName) . '.phar/vendor';
-} else {
- $baseDir = dirname(__DIR__);
- $vendorDir = $baseDir . '/vendor';
-
- if (!file_exists($vendorDir . '/autoload.php')) {
- $vendorDir = dirname(dirname($baseDir));
- }
-
- if (!getenv("BARTLETTRC")) {
- putenv("BARTLETTRC=" . strtolower($appName) . '.json');
- }
+require_once $vendorDir . '/Bartlett/CompatInfo/autoload.php';
+if (!getenv("BARTLETTRC")) {
+ putenv("BARTLETTRC=" . strtolower($appName) . '.json');
}
-$loader = require_once $vendorDir . '/autoload.php';
-$loader->setUseIncludePath(true);
if (\Phar::running()) {
if ($home) {
@@ -35,18 +24,10 @@ if (PHP_SAPI !== 'cli') {
return;
}
-if (\Phar::running()) {
- try {
- Bartlett\CompatInfo\Environment::checkRequirements();
- } catch (\RuntimeException $e) {
- die ($e->getMessage());
- }
-}
-
use Bartlett\Reflect\Environment;
use Bartlett\CompatInfo\Console\Application;
Environment::setScanDir();
-$application = new Application($appName, '4.4');
+$application = new Application($appName, '@package_version@');
$application->run();
diff -up ./data/handleDB.php.rpm ./data/handleDB.php
--- ./data/handleDB.php.rpm 2015-07-11 10:04:30.000000000 +0200
+++ ./data/handleDB.php 2015-07-13 09:06:15.108698079 +0200
@@ -11,7 +11,8 @@
* @since Release 4.0.0alpha3
*/
-require_once dirname(__DIR__) . '/vendor/autoload.php';
+require_once __DIR__ . '/../src/Bartlett/CompatInfo/autoload.php';
+
require_once __DIR__ . '/ReferenceCollection.php';
use Bartlett\CompatInfo\Reference\ExtensionFactory;
diff -up ./src/Bartlett/CompatInfo/Environment.php.rpm ./src/Bartlett/CompatInfo/Environment.php
--- ./src/Bartlett/CompatInfo/Environment.php.rpm 2015-07-13 09:10:10.271476463 +0200
+++ ./src/Bartlett/CompatInfo/Environment.php 2015-07-13 09:10:52.422615982 +0200
@@ -36,6 +36,12 @@ class Environment
*/
public static function initRefDb()
{
+ if (($database = getenv('BARTLETT_COMPATINFO_DB')) && file_exists($database)) {
+ return new \PDO('sqlite:' . $database);
+ } else if (file_exists($database = '/usr/share/php-bartlett-PHP-CompatInfo/compatinfo.sqlite')) {
+ return new \PDO('sqlite:' . $database);
+ }
+
$database = 'compatinfo.sqlite';
$tempDir = sys_get_temp_dir() . '/bartlett';
diff -up ./tests/bootstrap.php.rpm ./tests/bootstrap.php
--- ./tests/bootstrap.php.rpm 2015-07-11 10:04:30.000000000 +0200
+++ ./tests/bootstrap.php 2015-07-13 09:06:15.108698079 +0200
@@ -1,8 +1,11 @@
<?php
$baseDir = dirname(__DIR__);
-$vendorDir = $baseDir . '/vendor';
+$vendorDir = '/usr/share/php';
-require_once $vendorDir . '/autoload.php';
+require_once 'Bartlett/CompatInfo/autoload.php';
+$fedoraClassLoader->addPrefix('Bartlett\\Tests\\CompatInfo', $baseDir . '/tests');
+putenv('BARTLETT_COMPATINFO_DB='.dirname(__DIR__).'/data/compatinfo.sqlite');
+# Class not catched by autoloader
require __DIR__ . '/Reference/GenericTest.php';
|
