Skip to content

Commit

Permalink
Merge pull request owncloud#164 from owncloud/generic_stream_wrapper
Browse files Browse the repository at this point in the history
add generic stream wrapper developed by icewind as 3rdparty dependency
  • Loading branch information
DeepDiver1975 committed Mar 10, 2015
2 parents 322e9ce + b0b21a3 commit d849ddf
Show file tree
Hide file tree
Showing 17 changed files with 2,858 additions and 2,161 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -68,3 +68,5 @@ ircmaxell/random-lib/README.md
ircmaxell/random-lib/composer.json
ircmaxell/random-lib/composer.lock
ircmaxell/random-lib/phpunit.xml.dist

icewind/streams/tests
2 changes: 1 addition & 1 deletion autoload.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@

require_once __DIR__ . '/composer' . '/autoload_real.php';

return ComposerAutoloaderInitf8f4b6b0052169585e376266efaa5716::getLoader();
return ComposerAutoloaderInit534f628906b03cd0188ec46eb2dc1042::getLoader();
3 changes: 2 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
"symfony/routing": "~2.5",
"pimple/pimple": "~3.0",
"ircmaxell/password-compat": "1.0.*",
"nikic/php-parser": "~1.1"
"nikic/php-parser": "~1.1",
"icewind/Streams": "0.2.0"
}
}
44 changes: 42 additions & 2 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions composer/autoload_psr4.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,6 @@
'Sabre\\CardDAV\\' => array($vendorDir . '/sabre/dav/lib/CardDAV'),
'Sabre\\CalDAV\\' => array($vendorDir . '/sabre/dav/lib/CalDAV'),
'Punic\\' => array($vendorDir . '/punic/punic/code'),
'Icewind\\Streams\\Tests\\' => array($vendorDir . '/icewind/streams/tests'),
'Icewind\\Streams\\' => array($vendorDir . '/icewind/streams/src'),
);
10 changes: 5 additions & 5 deletions composer/autoload_real.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

// autoload_real.php @generated by Composer

class ComposerAutoloaderInitf8f4b6b0052169585e376266efaa5716
class ComposerAutoloaderInit534f628906b03cd0188ec46eb2dc1042
{
private static $loader;

Expand All @@ -19,9 +19,9 @@ public static function getLoader()
return self::$loader;
}

spl_autoload_register(array('ComposerAutoloaderInitf8f4b6b0052169585e376266efaa5716', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInit534f628906b03cd0188ec46eb2dc1042', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
spl_autoload_unregister(array('ComposerAutoloaderInitf8f4b6b0052169585e376266efaa5716', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInit534f628906b03cd0188ec46eb2dc1042', 'loadClassLoader'));

$includePaths = require __DIR__ . '/include_paths.php';
array_push($includePaths, get_include_path());
Expand All @@ -46,14 +46,14 @@ public static function getLoader()

$includeFiles = require __DIR__ . '/autoload_files.php';
foreach ($includeFiles as $file) {
composerRequiref8f4b6b0052169585e376266efaa5716($file);
composerRequire534f628906b03cd0188ec46eb2dc1042($file);
}

return $loader;
}
}

function composerRequiref8f4b6b0052169585e376266efaa5716($file)
function composerRequire534f628906b03cd0188ec46eb2dc1042($file)
{
require $file;
}
Loading

0 comments on commit d849ddf

Please sign in to comment.