summaryrefslogtreecommitdiffstats
path: root/apigen-rpm.patch
diff options
context:
space:
mode:
Diffstat (limited to 'apigen-rpm.patch')
-rw-r--r--apigen-rpm.patch67
1 files changed, 45 insertions, 22 deletions
diff --git a/apigen-rpm.patch b/apigen-rpm.patch
index 41a082c..0a7e887 100644
--- a/apigen-rpm.patch
+++ b/apigen-rpm.patch
@@ -1,6 +1,6 @@
-diff -ruN ApiGen-e9aff53d56d2b74104dee2b88396eb614e9717d5-old/bin/apigen ApiGen-e9aff53d56d2b74104dee2b88396eb614e9717d5/bin/apigen
---- ApiGen-e9aff53d56d2b74104dee2b88396eb614e9717d5-old/bin/apigen 2015-10-30 13:44:43.000000000 +0100
-+++ ApiGen-e9aff53d56d2b74104dee2b88396eb614e9717d5/bin/apigen 2015-11-01 10:01:25.000000000 +0100
+diff -up ./bin/apigen.rpm ./bin/apigen
+--- ./bin/apigen.rpm 2015-10-30 13:44:43.000000000 +0100
++++ ./bin/apigen 2015-11-03 08:06:32.480579189 +0100
@@ -1,7 +1,7 @@
#!/usr/bin/env php
<?php
@@ -10,7 +10,7 @@ diff -ruN ApiGen-e9aff53d56d2b74104dee2b88396eb614e9717d5-old/bin/apigen ApiGen-
// Create temp dir
-@@ -26,8 +26,8 @@
+@@ -26,8 +26,8 @@ if (isset($_SERVER['argv']) && ($tmp = a
$configurator = new Nette\Configurator;
$configurator->setDebugMode( ! Tracy\Debugger::$productionMode);
$configurator->setTempDirectory($tempDir);
@@ -21,10 +21,10 @@ diff -ruN ApiGen-e9aff53d56d2b74104dee2b88396eb614e9717d5-old/bin/apigen ApiGen-
$container = $configurator->createContainer();
-diff -ruN ApiGen-e9aff53d56d2b74104dee2b88396eb614e9717d5-old/src/autoload.php ApiGen-e9aff53d56d2b74104dee2b88396eb614e9717d5/src/autoload.php
---- ApiGen-e9aff53d56d2b74104dee2b88396eb614e9717d5-old/src/autoload.php 1970-01-01 01:00:00.000000000 +0100
-+++ ApiGen-e9aff53d56d2b74104dee2b88396eb614e9717d5/src/autoload.php 2015-11-01 09:32:57.000000000 +0100
-@@ -0,0 +1,32 @@
+diff -up ./src/autoload.php.rpm ./src/autoload.php
+--- ./src/autoload.php.rpm 2015-11-03 08:06:32.481579194 +0100
++++ ./src/autoload.php 2015-11-03 08:10:03.608531505 +0100
+@@ -0,0 +1,31 @@
+<?php
+// Autoloader for apigen/apigen and its dependencies
+$vendor = '/usr/share/php';
@@ -56,11 +56,10 @@ diff -ruN ApiGen-e9aff53d56d2b74104dee2b88396eb614e9717d5-old/src/autoload.php A
+require_once $vendor . '/Tracy/autoload.php';
+require_once $vendor . '/FSHL/autoload.php';
+require_once $vendor . '/Kdyby/Events/autoload.php';
-+require_once $vendor . '/Herrera/Phar/Update/autoload.php';
-diff -ruN ApiGen-e9aff53d56d2b74104dee2b88396eb614e9717d5-old/src/Configuration/ConfigurationOptionsResolver.php ApiGen-e9aff53d56d2b74104dee2b88396eb614e9717d5/src/Configuration/ConfigurationOptionsResolver.php
---- ApiGen-e9aff53d56d2b74104dee2b88396eb614e9717d5-old/src/Configuration/ConfigurationOptionsResolver.php 2015-10-30 13:44:43.000000000 +0100
-+++ ApiGen-e9aff53d56d2b74104dee2b88396eb614e9717d5/src/Configuration/ConfigurationOptionsResolver.php 2015-11-01 09:45:20.000000000 +0100
-@@ -231,10 +231,10 @@
+diff -up ./src/Configuration/ConfigurationOptionsResolver.php.rpm ./src/Configuration/ConfigurationOptionsResolver.php
+--- ./src/Configuration/ConfigurationOptionsResolver.php.rpm 2015-10-30 13:44:43.000000000 +0100
++++ ./src/Configuration/ConfigurationOptionsResolver.php 2015-11-03 08:06:32.481579194 +0100
+@@ -231,10 +231,10 @@ class ConfigurationOptionsResolver
private function getTemplateConfigPathFromTheme($theme)
{
if ($theme === self::TEMPLATE_THEME_DEFAULT) {
@@ -73,10 +72,35 @@ diff -ruN ApiGen-e9aff53d56d2b74104dee2b88396eb614e9717d5-old/src/Configuration/
}
throw new ConfigurationException(CO::TEMPLATE_THEME . ' ' . $theme . ' is not supported.');
-diff -ruN ApiGen-e9aff53d56d2b74104dee2b88396eb614e9717d5-old/src/Theme/ThemeConfigPathResolver.php ApiGen-e9aff53d56d2b74104dee2b88396eb614e9717d5/src/Theme/ThemeConfigPathResolver.php
---- ApiGen-e9aff53d56d2b74104dee2b88396eb614e9717d5-old/src/Theme/ThemeConfigPathResolver.php 2015-10-30 13:44:43.000000000 +0100
-+++ ApiGen-e9aff53d56d2b74104dee2b88396eb614e9717d5/src/Theme/ThemeConfigPathResolver.php 2015-11-01 10:02:31.000000000 +0100
-@@ -38,7 +38,7 @@
+diff -up ./src/DI/ApiGenExtension.php.rpm ./src/DI/ApiGenExtension.php
+--- ./src/DI/ApiGenExtension.php.rpm 2015-11-03 08:08:42.874167346 +0100
++++ ./src/DI/ApiGenExtension.php 2015-11-03 08:09:24.816356528 +0100
+@@ -61,10 +61,6 @@ class ApiGenExtension extends CompilerEx
+ $application = $builder->getDefinition($builder->getByType('ApiGen\Console\Application'));
+
+ foreach (array_keys($builder->findByTag(self::TAG_CONSOLE_COMMAND)) as $serviceName) {
+- $className = $builder->getDefinition($serviceName)->getClass();
+- if ( ! $this->isPhar() && $className === 'ApiGen\Command\SelfUpdateCommand') {
+- continue;
+- }
+ $application->addSetup('add', ['@' . $serviceName]);
+ }
+ }
+diff -up ./src/DI/apigen.services.neon.rpm ./src/DI/apigen.services.neon
+--- ./src/DI/apigen.services.neon.rpm 2015-11-03 08:08:48.525192830 +0100
++++ ./src/DI/apigen.services.neon 2015-11-03 08:08:55.423223948 +0100
+@@ -1,7 +1,6 @@
+ services:
+ # commands
+ - {class: ApiGen\Command\GenerateCommand, tags: [console.command]}
+- - {class: ApiGen\Command\SelfUpdateCommand, tags: [console.command]}
+
+ # configuration
+ - ApiGen\Configuration\Configuration
+diff -up ./src/Theme/ThemeConfigPathResolver.php.rpm ./src/Theme/ThemeConfigPathResolver.php
+--- ./src/Theme/ThemeConfigPathResolver.php.rpm 2015-10-30 13:44:43.000000000 +0100
++++ ./src/Theme/ThemeConfigPathResolver.php 2015-11-03 08:06:32.481579194 +0100
+@@ -38,7 +38,7 @@ class ThemeConfigPathResolver
{
$allowedPaths = [
$this->rootDir,
@@ -85,10 +109,10 @@ diff -ruN ApiGen-e9aff53d56d2b74104dee2b88396eb614e9717d5-old/src/Theme/ThemeCon
];
foreach ($allowedPaths as $allowedPath) {
-diff -ruN ApiGen-e9aff53d56d2b74104dee2b88396eb614e9717d5-old/tests/bootstrap.php ApiGen-e9aff53d56d2b74104dee2b88396eb614e9717d5/tests/bootstrap.php
---- ApiGen-e9aff53d56d2b74104dee2b88396eb614e9717d5-old/tests/bootstrap.php 2015-10-30 13:44:43.000000000 +0100
-+++ ApiGen-e9aff53d56d2b74104dee2b88396eb614e9717d5/tests/bootstrap.php 2015-11-01 09:49:31.000000000 +0100
-@@ -1,7 +1,14 @@
+diff -up ./tests/bootstrap.php.rpm ./tests/bootstrap.php
+--- ./tests/bootstrap.php.rpm 2015-10-30 13:44:43.000000000 +0100
++++ ./tests/bootstrap.php 2015-11-03 08:10:14.113578889 +0100
+@@ -1,7 +1,13 @@
<?php
-include __DIR__ . '/../vendor/autoload.php';
@@ -100,7 +124,6 @@ diff -ruN ApiGen-e9aff53d56d2b74104dee2b88396eb614e9717d5-old/tests/bootstrap.ph
+$Loader->register();
+
+require_once $vendor . '/Mockery/autoload.php';
-+require_once $vendor . '/Herrera/Box/autoload.php';
$tempDir = __DIR__ . '/temp/' . getmypid();
define('TEMP_DIR', $tempDir);