diff options
| author | Remi Collet <fedora@famillecollet.com> | 2017-01-17 15:14:19 +0100 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2017-01-17 15:14:19 +0100 |
| commit | 82168f473ef55918dd99a31fc87700510bdc6748 (patch) | |
| tree | 29a7d173348c6ae9eec493c2e3d1ea9b4b756d3d /php-sabre-dav-autoload.patch | |
| parent | d635a4351d642fe85488946a085fabf18729d67b (diff) | |
php-sabre-dav: 3.2.0
Diffstat (limited to 'php-sabre-dav-autoload.patch')
| -rw-r--r-- | php-sabre-dav-autoload.patch | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/php-sabre-dav-autoload.patch b/php-sabre-dav-autoload.patch index a1af77d..4e7c252 100644 --- a/php-sabre-dav-autoload.patch +++ b/php-sabre-dav-autoload.patch @@ -1,32 +1,33 @@ -diff -up tests/bootstrap.php.orig tests/bootstrap.php ---- tests/bootstrap.php.orig 2016-03-11 17:23:07.419944832 +0100 -+++ tests/bootstrap.php 2016-03-11 17:25:57.205599320 +0100 -@@ -1,21 +1,20 @@ +diff -up ./tests/bootstrap.php.rpm ./tests/bootstrap.php +--- ./tests/bootstrap.php.rpm 2017-01-17 14:58:57.986380935 +0100 ++++ ./tests/bootstrap.php 2017-01-17 15:00:56.261957259 +0100 +@@ -1,22 +1,21 @@ <?php -set_include_path(__DIR__ . '/../lib/' . PATH_SEPARATOR . __DIR__ . PATH_SEPARATOR . get_include_path()); - -$autoLoader = include __DIR__ . '/../vendor/autoload.php'; +require '@BUILDROOT@/usr/share/php/Sabre/DAV/autoload.php'; ++require '/usr/share/php/Monolog/autoload.php'; // SabreDAV tests auto loading -$autoLoader->add('Sabre\\', __DIR__); +\Fedora\Autoloader\Autoload::addPsr0('Sabre\\', __DIR__); -+ // VObject tests auto loading --$autoLoader->addPsr4('Sabre\\VObject\\',__DIR__ . '/../vendor/sabre/vobject/tests/VObject'); --$autoLoader->addPsr4('Sabre\\Xml\\',__DIR__ . '/../vendor/sabre/xml/tests/Sabre/Xml'); -+//$autoLoader->addPsr4('Sabre\\VObject\\',__DIR__ . '/../vendor/sabre/vobject/tests/VObject'); -+//$autoLoader->addPsr4('Sabre\\Xml\\',__DIR__ . '/../vendor/sabre/xml/tests/Sabre/Xml'); +-$autoLoader->addPsr4('Sabre\\VObject\\', __DIR__ . '/../vendor/sabre/vobject/tests/VObject'); +-$autoLoader->addPsr4('Sabre\\Xml\\', __DIR__ . '/../vendor/sabre/xml/tests/Sabre/Xml'); ++//$autoLoader->addPsr4('Sabre\\VObject\\', __DIR__ . '/../vendor/sabre/vobject/tests/VObject'); ++//$autoLoader->addPsr4('Sabre\\Xml\\', __DIR__ . '/../vendor/sabre/xml/tests/Sabre/Xml'); date_default_timezone_set('UTC'); $config = [ 'SABRE_TEMPDIR' => dirname(__FILE__) . '/temp/', -- 'SABRE_HASSQLITE' => in_array('sqlite',PDO::getAvailableDrivers()), -- 'SABRE_HASMYSQL' => in_array('mysql',PDO::getAvailableDrivers()), -+ 'SABRE_HASSQLITE' => 1, -+ 'SABRE_HASMYSQL' => 0, - 'SABRE_MYSQLDSN' => 'mysql:host=127.0.0.1;dbname=sabredav', - 'SABRE_MYSQLUSER' => 'root', + 'SABRE_HASSQLITE' => in_array('sqlite', PDO::getAvailableDrivers()), +- 'SABRE_HASMYSQL' => in_array('mysql', PDO::getAvailableDrivers()), +- 'SABRE_HASPGSQL' => in_array('pgsql', PDO::getAvailableDrivers()), ++ 'SABRE_HASMYSQL' => false, ++ 'SABRE_HASPGSQL' => false, + 'SABRE_MYSQLDSN' => 'mysql:host=127.0.0.1;dbname=sabredav_test', + 'SABRE_MYSQLUSER' => 'sabredav', 'SABRE_MYSQLPASS' => '', |