Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
project
drupal
Commits
ef326513
Commit
ef326513
authored
May 13, 2013
by
Nathaniel Catchpole
Browse files
Issue
#1977570
by RobLoach: Update third-party vendors and fix composer.json
parent
e5fbed4c
Changes
543
Expand all
Hide whitespace changes
Inline
Side-by-side
composer.json
View file @
ef326513
...
...
@@ -4,22 +4,22 @@
"type"
:
"drupal-core"
,
"license"
:
"GPL-2.0+"
,
"require"
:
{
"
symfony/class-loader
"
:
"
2.2.
0
"
,
"
symfony/dependency-injection
"
:
"
2.2.
0
"
,
"
symfony/event-dispatcher
"
:
"
2.2.
0
"
,
"
symfony/http-foundation
"
:
"
2.2.
0
"
,
"
symfony/http-kernel
"
:
"
2.2.
0
"
,
"
symfony/routing
"
:
"
2.2.
0
"
,
"
symfony/serializer
"
:
"
2.2.
0
"
,
"
symfony/validator
"
:
"
2.2.
0
"
,
"
symfony/yaml
"
:
"
2.2.
0
"
,
"
twig/twig
"
:
"
1.12.
1
"
,
"
doctrine/common
"
:
"
2.3.
0
"
,
"
guzzle/http
"
:
"
3.1.
0
"
,
"
kriswallsmith/assetic
"
:
"
1.1.
0-
alpha
1
"
,
"
symfony-cmf/routing
"
:
"
dev-master#ea4a10
"
,
"
easyrdf/easyrdf
"
:
"
0.8.
0-
beta
.1
"
,
"
phpunit/phpunit
"
:
"
3.7.
15
"
"
symfony/class-loader
"
:
"
2.2.
*
"
,
"
symfony/dependency-injection
"
:
"
2.2.
*
"
,
"
symfony/event-dispatcher
"
:
"
2.2.
*
"
,
"
symfony/http-foundation
"
:
"
2.2.
*
"
,
"
symfony/http-kernel
"
:
"
2.2.
*
"
,
"
symfony/routing
"
:
"
2.2.
*
"
,
"
symfony/serializer
"
:
"
2.2.
*
"
,
"
symfony/validator
"
:
"
2.2.
*
"
,
"
symfony/yaml
"
:
"
2.2.
*
"
,
"
twig/twig
"
:
"
1.12.
*
"
,
"
doctrine/common
"
:
"
2.3.
*
"
,
"
guzzle/http
"
:
"
3.1.
*
"
,
"
kriswallsmith/assetic
"
:
"
1.1.
*@
alpha
"
,
"
symfony-cmf/routing
"
:
"
1.1.*@alpha
"
,
"
easyrdf/easyrdf
"
:
"
0.8.
*@
beta
"
,
"
phpunit/phpunit
"
:
"
3.7.
*
"
},
"autoload"
:
{
"psr-0"
:
{
...
...
@@ -28,8 +28,8 @@
"Drupal\\Driver"
:
"drivers/lib/"
}
},
"minimum-stability"
:
"dev"
,
"config"
:
{
"vendor-dir"
:
"core/vendor"
"vendor-dir"
:
"core/vendor"
,
"preferred-install"
:
"dist"
}
}
composer.lock
View file @
ef326513
This diff is collapsed.
Click to expand it.
core/
vendor/
.gitignore
→
core/.gitignore
View file @
ef326513
# SimpleTest breaks with the following files, so avoid adding them.
symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1-1.php
symfony/class-loader/Symfony/Component/ClassLoader/Tests/Fixtures/php5.4/traits.php
symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services11.php
vendor/
symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1-1.php
vendor/
symfony/class-loader/Symfony/Component/ClassLoader/Tests/Fixtures/php5.4/traits.php
vendor/
symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services11.php
# The resources for the Validator component are not required.
symfony/validator/Symfony/Component/Validator/Resources
vendor/
symfony/validator/Symfony/Component/Validator/Resources
# Symfony Validator depends on Symfony Translation but only requires the
# TranslatorInterface. Thus, we add only the required interface from Symfony
# Translation by ignoring everything except the interface.
symfony/translation/Symfony/Component/Translation/*
!symfony/translation/Symfony/Component/Translation/TranslatorInterface.php
vendor/
symfony/translation/Symfony/Component/Translation/*
!
vendor/
symfony/translation/Symfony/Component/Translation/TranslatorInterface.php
# PHPUnit provides some binary dependencies that are already available.
vendor/phpunit/phpunit/build/dependencies
core/vendor/autoload.php
View file @
ef326513
...
...
@@ -4,4 +4,4 @@
require_once
__DIR__
.
'/composer'
.
'/autoload_real.php'
;
return
ComposerAutoloaderInit
7f0efddf867398398517e0ca6863b8f1
::
getLoader
();
return
ComposerAutoloaderInit
c244582ae2d491644d70197d64a9670b
::
getLoader
();
core/vendor/composer/ClassLoader.php
View file @
ef326513
...
...
@@ -49,7 +49,7 @@ class ClassLoader
public
function
getPrefixes
()
{
return
$this
->
prefixes
;
return
call_user_func_array
(
'array_merge'
,
$this
->
prefixes
)
;
}
public
function
getFallbackDirs
()
...
...
@@ -98,19 +98,21 @@ public function add($prefix, $paths, $prepend = false)
return
;
}
if
(
!
isset
(
$this
->
prefixes
[
$prefix
]))
{
$this
->
prefixes
[
$prefix
]
=
(
array
)
$paths
;
$first
=
$prefix
[
0
];
if
(
!
isset
(
$this
->
prefixes
[
$first
][
$prefix
]))
{
$this
->
prefixes
[
$first
][
$prefix
]
=
(
array
)
$paths
;
return
;
}
if
(
$prepend
)
{
$this
->
prefixes
[
$prefix
]
=
array_merge
(
$this
->
prefixes
[
$
first
][
$
prefix
]
=
array_merge
(
(
array
)
$paths
,
$this
->
prefixes
[
$prefix
]
$this
->
prefixes
[
$
first
][
$
prefix
]
);
}
else
{
$this
->
prefixes
[
$prefix
]
=
array_merge
(
$this
->
prefixes
[
$prefix
],
$this
->
prefixes
[
$
first
][
$
prefix
]
=
array_merge
(
$this
->
prefixes
[
$
first
][
$
prefix
],
(
array
)
$paths
);
}
...
...
@@ -129,7 +131,7 @@ public function set($prefix, $paths)
return
;
}
$this
->
prefixes
[
$prefix
]
=
(
array
)
$paths
;
$this
->
prefixes
[
substr
(
$prefix
,
0
,
1
)][
$prefix
]
=
(
array
)
$paths
;
}
/**
...
...
@@ -175,7 +177,7 @@ public function unregister()
* Loads the given class or interface.
*
* @param string $class The name of the class
* @return bool|null True
,
if loaded
* @return bool|null True if loaded
, null otherwise
*/
public
function
loadClass
(
$class
)
{
...
...
@@ -191,7 +193,7 @@ public function loadClass($class)
*
* @param string $class The name of the class
*
* @return string|
null
The path
,
if found
* @return string|
false
The path if found
, false otherwise
*/
public
function
findFile
(
$class
)
{
...
...
@@ -205,7 +207,7 @@ public function findFile($class)
if
(
false
!==
$pos
=
strrpos
(
$class
,
'\\'
))
{
// namespaced class name
$classPath
=
str
_replace
(
'\\'
,
DIRECTORY_SEPARATOR
,
substr
(
$class
,
0
,
$pos
)
)
.
DIRECTORY_SEPARATOR
;
$classPath
=
str
tr
(
substr
(
$class
,
0
,
$pos
),
'\\'
,
DIRECTORY_SEPARATOR
)
.
DIRECTORY_SEPARATOR
;
$className
=
substr
(
$class
,
$pos
+
1
);
}
else
{
// PEAR-like class name
...
...
@@ -213,13 +215,16 @@ public function findFile($class)
$className
=
$class
;
}
$classPath
.
=
str
_replace
(
'_'
,
DIRECTORY_SEPARATOR
,
$className
)
.
'.php'
;
$classPath
.
=
str
tr
(
$className
,
'_'
,
DIRECTORY_SEPARATOR
)
.
'.php'
;
foreach
(
$this
->
prefixes
as
$prefix
=>
$dirs
)
{
if
(
0
===
strpos
(
$class
,
$prefix
))
{
foreach
(
$dirs
as
$dir
)
{
if
(
file_exists
(
$dir
.
DIRECTORY_SEPARATOR
.
$classPath
))
{
return
$dir
.
DIRECTORY_SEPARATOR
.
$classPath
;
$first
=
$class
[
0
];
if
(
isset
(
$this
->
prefixes
[
$first
]))
{
foreach
(
$this
->
prefixes
[
$first
]
as
$prefix
=>
$dirs
)
{
if
(
0
===
strpos
(
$class
,
$prefix
))
{
foreach
(
$dirs
as
$dir
)
{
if
(
file_exists
(
$dir
.
DIRECTORY_SEPARATOR
.
$classPath
))
{
return
$dir
.
DIRECTORY_SEPARATOR
.
$classPath
;
}
}
}
}
...
...
core/vendor/composer/autoload_classmap.php
View file @
ef326513
This diff is collapsed.
Click to expand it.
core/vendor/composer/autoload_namespaces.php
View file @
ef326513
...
...
@@ -2,32 +2,32 @@
// autoload_namespaces.php generated by Composer
$vendorDir
=
dirname
(
__DIR
__
);
$baseDir
=
dirname
(
$vendorDir
);
$vendorDir
=
dirname
(
dirname
(
__FILE
__
)
)
;
$baseDir
=
dirname
(
dirname
(
$vendorDir
)
)
;
return
array
(
'
Drupal\\Driver'
=>
$baseDir
.
'/../drivers
/lib
/
'
,
'
Drupal\\Core'
=>
$baseDir
.
'/lib/'
,
'
Drupal
\\Component
'
=>
$baseDir
.
'/lib/'
,
'
Twig_'
=>
$vendorDir
.
'/twig/twig/lib/'
,
'Symfony\\Component\\
Yaml
\\'
=>
$vendorDir
.
'/symfony/
yaml/'
,
'Symfony\\Component\\
Validator
\\'
=>
$vendorDir
.
'/symfony/
validator/'
,
'Symfony\\Component\\
Translation
\\'
=>
$vendorDir
.
'/symfony/
translation/'
,
'Symfony\\Component\\
Serializer
\\'
=>
$vendorDir
.
'/symfony/
serializer/'
,
'Symfony\\Component\\
Routing
\\'
=>
$vendorDir
.
'/symfony/
routing/'
,
'Symfony\\Component\\
Process'
=>
$vendorDir
.
'/symfony/
process/'
,
'Symfony\\Component\\
HttpKernel
\\'
=>
$vendorDir
.
'/symfony/
http-kernel/'
,
'Symfony\\Component\\
HttpFoundation
\\'
=>
$vendorDir
.
'/symfony/
http-foundation/'
,
'Symfony\\Component\\
EventDispatcher\\'
=>
$vendorDir
.
'/symfony
/event-dispatcher/'
,
'
Symfony\\Component\\DependencyInjection
\\'
=>
$vendorDir
.
'/
symfony/dependency-injection/'
,
'
Symfony\\Component\\ClassLoader\\'
=>
$vendorDir
.
'/symfony/class-loader/'
,
'
Symfony\\Cmf\\Component\\Routing'
=>
$vendorDir
.
'/symfony-cmf/routing/'
,
'
Psr\\Log\\'
=>
$vendorDir
.
'/
psr/log/'
,
'Guzzle\\
Stream'
=>
$vendorDir
.
'/guzzle/
stream/'
,
'
Guzzle\\Parser'
=>
$vendorDir
.
'/guzzle/parser/'
,
'
Guzzle\\Http'
=>
$vendorDir
.
'/guzzle/http/'
,
'
Guzzle\\Common'
=>
$vendorDir
.
'/guzzle/common/'
,
'
EasyRdf_'
=>
$vendorDir
.
'/easyrdf/easyrdf
/lib
/
'
,
'Doctrine\\Common'
=>
$vendorDir
.
'/doctrine/common/lib
/
'
,
'Assetic'
=>
$vendorDir
.
'/kriswallsmith/assetic/src
/
'
,
'
Twig_'
=>
array
(
$vendorDir
.
'/twig/twig
/lib'
)
,
'
Symfony\\Component\\Yaml\\'
=>
array
(
$vendorDir
.
'/symfony/yaml'
)
,
'
Symfony
\\Component
\\Validator\\'
=>
array
(
$vendorDir
.
'/symfony/validator'
)
,
'
Symfony\\Component\\Translation\\'
=>
array
(
$vendorDir
.
'/symfony/translation'
)
,
'Symfony\\Component\\
Serializer
\\'
=>
array
(
$vendorDir
.
'/symfony/
serializer'
)
,
'Symfony\\Component\\
Routing
\\'
=>
array
(
$vendorDir
.
'/symfony/
routing'
)
,
'Symfony\\Component\\
Process
\\'
=>
array
(
$vendorDir
.
'/symfony/
process'
)
,
'Symfony\\Component\\
HttpKernel
\\'
=>
array
(
$vendorDir
.
'/symfony/
http-kernel'
)
,
'Symfony\\Component\\
HttpFoundation
\\'
=>
array
(
$vendorDir
.
'/symfony/
http-foundation'
)
,
'Symfony\\Component\\
EventDispatcher\\'
=>
array
(
$vendorDir
.
'/symfony/
event-dispatcher'
)
,
'Symfony\\Component\\
DependencyInjection
\\'
=>
array
(
$vendorDir
.
'/symfony/
dependency-injection'
)
,
'Symfony\\Component\\
ClassLoader
\\'
=>
array
(
$vendorDir
.
'/symfony/
class-loader'
)
,
'Symfony\\
Cmf\\
Component\\
Routing'
=>
array
(
$vendorDir
.
'/symfony
-cmf/routing'
)
,
'
Psr\\Log
\\'
=>
array
(
$vendorDir
.
'/
psr/log'
)
,
'
Guzzle\\Stream'
=>
array
(
$vendorDir
.
'/guzzle/stream'
)
,
'
Guzzle\\Parser'
=>
array
(
$vendorDir
.
'/guzzle/parser'
)
,
'
Guzzle\\Http'
=>
array
(
$vendorDir
.
'/
guzzle/http'
)
,
'Guzzle\\
Common'
=>
array
(
$vendorDir
.
'/guzzle/
common'
)
,
'
EasyRdf_'
=>
array
(
$vendorDir
.
'/easyrdf/easyrdf/lib'
)
,
'
Drupal\\Driver'
=>
array
(
$baseDir
.
'/drivers/lib'
)
,
'
Drupal\\Core'
=>
array
(
$baseDir
.
'/core/lib'
)
,
'
Drupal\\Component'
=>
array
(
$baseDir
.
'/core
/lib'
)
,
'Doctrine\\Common'
=>
array
(
$vendorDir
.
'/doctrine/common/lib'
)
,
'Assetic'
=>
array
(
$vendorDir
.
'/kriswallsmith/assetic/src'
)
,
);
core/vendor/composer/autoload_real.php
View file @
ef326513
...
...
@@ -2,7 +2,7 @@
// autoload_real.php generated by Composer
class
ComposerAutoloaderInit
7f0efddf867398398517e0ca6863b8f1
class
ComposerAutoloaderInit
c244582ae2d491644d70197d64a9670b
{
private
static
$loader
;
...
...
@@ -19,12 +19,12 @@ public static function getLoader()
return
self
::
$loader
;
}
spl_autoload_register
(
array
(
'ComposerAutoloaderInit
7f0efddf867398398517e0ca6863b8f1
'
,
'loadClassLoader'
));
spl_autoload_register
(
array
(
'ComposerAutoloaderInit
c244582ae2d491644d70197d64a9670b
'
,
'loadClassLoader'
)
,
true
,
true
);
self
::
$loader
=
$loader
=
new
\
Composer\Autoload\ClassLoader
();
spl_autoload_unregister
(
array
(
'ComposerAutoloaderInit
7f0efddf867398398517e0ca6863b8f1
'
,
'loadClassLoader'
));
spl_autoload_unregister
(
array
(
'ComposerAutoloaderInit
c244582ae2d491644d70197d64a9670b
'
,
'loadClassLoader'
));
$vendorDir
=
dirname
(
__DIR__
);
$baseDir
=
dirname
(
$vendorDir
);
$baseDir
=
dirname
(
dirname
(
$vendorDir
)
)
;
$includePaths
=
require
__DIR__
.
'/include_paths.php'
;
array_push
(
$includePaths
,
get_include_path
());
...
...
@@ -32,7 +32,7 @@ public static function getLoader()
$map
=
require
__DIR__
.
'/autoload_namespaces.php'
;
foreach
(
$map
as
$namespace
=>
$path
)
{
$loader
->
add
(
$namespace
,
$path
);
$loader
->
set
(
$namespace
,
$path
);
}
$classMap
=
require
__DIR__
.
'/autoload_classmap.php'
;
...
...
@@ -42,6 +42,8 @@ public static function getLoader()
$loader
->
register
(
true
);
require
$vendorDir
.
'/kriswallsmith/assetic/src/functions.php'
;
return
$loader
;
}
}
core/vendor/composer/include_paths.php
View file @
ef326513
...
...
@@ -2,16 +2,16 @@
// include_paths.php generated by Composer
$vendorDir
=
dirname
(
__DIR
__
);
$baseDir
=
dirname
(
$vendorDir
);
$vendorDir
=
dirname
(
dirname
(
__FILE
__
)
)
;
$baseDir
=
dirname
(
dirname
(
$vendorDir
)
)
;
return
array
(
$vendorDir
.
'/phpunit/php-text-template
/
'
,
$vendorDir
.
'/phpunit/phpunit-mock-objects
/
'
,
$vendorDir
.
'/phpunit/php-timer
/
'
,
$vendorDir
.
'/phpunit/php-token-stream
/
'
,
$vendorDir
.
'/phpunit/php-file-iterator
/
'
,
$vendorDir
.
'/phpunit/php-code-coverage
/
'
,
$vendorDir
.
'/phpunit/phpunit
/
'
,
$vendorDir
.
'/
phpunit/phpunit/../../
symfony/yaml'
,
$vendorDir
.
'/phpunit/php-text-template'
,
$vendorDir
.
'/phpunit/phpunit-mock-objects'
,
$vendorDir
.
'/phpunit/php-timer'
,
$vendorDir
.
'/phpunit/php-token-stream'
,
$vendorDir
.
'/phpunit/php-file-iterator'
,
$vendorDir
.
'/phpunit/php-code-coverage'
,
$vendorDir
.
'/phpunit/phpunit'
,
$vendorDir
.
'/symfony/yaml'
,
);
core/vendor/composer/installed.json
View file @
ef326513
This diff is collapsed.
Click to expand it.
core/vendor/guzzle/common/Guzzle/Common/Collection.php
View file @
ef326513
...
...
@@ -365,26 +365,78 @@ public function inject($input)
/**
* Gets a value from the collection using an array path (e.g. foo/baz/bar would retrieve bar from two nested arrays)
* Allows for wildcard searches which recursively combine matches up to the level at which the wildcard occurs. This
* can be useful for accepting any key of a sub-array and combining matching keys from each diverging path.
*
* @param string $path Path to traverse and retrieve a value from
* @param string $separator Character used to add depth to the search
* @param mixed $data Optional data to descend into (used when wildcards are encountered)
*
* @return mixed|null
*/
public
function
getPath
(
$path
,
$separator
=
'/'
)
public
function
getPath
(
$path
,
$separator
=
'/'
,
$data
=
null
)
{
$parts
=
explode
(
$separator
,
$path
);
$data
=
&
$this
->
data
;
// Assume the data of the collection if no data was passed into the method
if
(
$data
===
null
)
{
$data
=
&
$this
->
data
;
}
// Break the path into an array if needed
if
(
!
is_array
(
$path
))
{
$path
=
explode
(
$separator
,
$path
);
}
// Using an iterative approach rather than recursion for speed
while
(
null
!==
(
$part
=
array_shift
(
$pa
rts
)))
{
// Return null if this path doesn't exist or if there's more depth and the value is not an array
if
(
!
isset
(
$data
[
$part
])
||
(
$parts
&&
!
is_array
(
$data
[
$part
])
))
{
while
(
null
!==
(
$part
=
array_shift
(
$pa
th
)))
{
if
(
!
is_array
(
$data
))
{
return
null
;
}
// The value does not exist in the array or the path has more but the value is not an array
if
(
!
isset
(
$data
[
$part
]))
{
// Not using a wildcard and the key was not found, so return null
if
(
$part
!=
'*'
)
{
return
null
;
}
// If using a wildcard search, then diverge and combine paths
$result
=
array
();
foreach
(
$data
as
$value
)
{
if
(
!
$path
)
{
$result
=
array_merge_recursive
(
$result
,
(
array
)
$value
);
}
else
{
$test
=
$this
->
getPath
(
$path
,
$separator
,
$value
);
if
(
$test
!==
null
)
{
$result
=
array_merge_recursive
(
$result
,
(
array
)
$test
);
}
}
}
return
$result
;
}
// Descend deeper into the data
$data
=
&
$data
[
$part
];
}
return
$data
;
}
/**
* Over write key value pairs in this collection with all of the data from an array or collection.
*
* @param array|\Traversable $data Values to override over this config
*
* @return self
*/
public
function
overwriteWith
(
$data
)
{
foreach
(
$data
as
$k
=>
$v
)
{
$this
->
set
(
$k
,
$v
);
}
return
$this
;
}
}
core/vendor/guzzle/common/Guzzle/Common/Version.php
View file @
ef326513
...
...
@@ -7,5 +7,5 @@
*/
class
Version
{
const
VERSION
=
'3.1.
0
'
;
const
VERSION
=
'3.1.
2
'
;
}
core/vendor/guzzle/http/Guzzle/Http/Client.php
View file @
ef326513
...
...
@@ -30,6 +30,11 @@ class Client extends AbstractHasDispatcher implements ClientInterface
*/
protected
$defaultHeaders
;
/**
* @var string The user agent string to set on each request
*/
protected
$userAgent
;
/**
* @var Collection Parameter object holding configuration data
*/
...
...
@@ -133,7 +138,7 @@ final public function setSslVerification($certificateAuthority = true, $verifyPe
}
elseif
(
$certificateAuthority
===
false
)
{
unset
(
$opts
[
CURLOPT_CAINFO
]);
$opts
[
CURLOPT_SSL_VERIFYPEER
]
=
false
;
$opts
[
CURLOPT_SSL_VERIFYHOST
]
=
1
;
$opts
[
CURLOPT_SSL_VERIFYHOST
]
=
2
;
}
elseif
(
$verifyPeer
!==
true
&&
$verifyPeer
!==
false
&&
$verifyPeer
!==
1
&&
$verifyPeer
!==
0
)
{
throw
new
InvalidArgumentException
(
'verifyPeer must be 1, 0 or boolean'
);
}
elseif
(
$verifyHost
!==
0
&&
$verifyHost
!==
1
&&
$verifyHost
!==
2
)
{
...
...
@@ -240,6 +245,10 @@ public function createRequest($method = RequestInterface::GET, $uri = null, $hea
$url
=
Url
::
factory
(
$this
->
getBaseUrl
())
->
combine
(
$this
->
expandTemplate
(
$uri
,
$templateVars
));
}
if
(
$this
->
userAgent
)
{
$this
->
defaultHeaders
->
set
(
'User-Agent'
,
$this
->
userAgent
);
}
// If default headers are provided, then merge them into existing headers
// If a collision occurs, the header is completely replaced
if
(
count
(
$this
->
defaultHeaders
))
{
...
...
@@ -283,7 +292,7 @@ public function setUserAgent($userAgent, $includeDefault = false)
if
(
$includeDefault
)
{
$userAgent
.
=
' '
.
Utils
::
getDefaultUserAgent
();
}
$this
->
defaultHeaders
->
set
(
'U
ser
-
Agent
'
,
$userAgent
)
;
$this
->
u
serAgent
=
$userAgent
;
return
$this
;
}
...
...
core/vendor/guzzle/http/Guzzle/Http/Curl/CurlHandle.php
View file @
ef326513
...
...
@@ -72,6 +72,13 @@ public static function factory(RequestInterface $request)
CURLOPT_SSL_VERIFYHOST
=>
2
);
// Add CURLOPT_ENCODING if Accept-Encoding header is provided
if
(
$acceptEncodingHeader
=
$request
->
getHeader
(
'Accept-Encoding'
))
{
$curlOptions
[
CURLOPT_ENCODING
]
=
(
string
)
$acceptEncodingHeader
;
// Let cURL set the Accept-Encoding header, prevents duplicate values
$request
->
removeHeader
(
'Accept-Encoding'
);
}
// Enable the progress function if the 'progress' param was set
if
(
$requestCurlOptions
->
get
(
'progress'
))
{
$curlOptions
[
CURLOPT_PROGRESSFUNCTION
]
=
array
(
$mediator
,
'progress'
);
...
...
core/vendor/guzzle/http/Guzzle/Http/QueryString.php
View file @
ef326513
...
...
@@ -220,6 +220,8 @@ public function isUrlEncoding()
public
function
setAggregateFunction
(
$callback
)
{
$this
->
aggregator
=
$callback
;
return
$this
;
}
/**
...
...
core/vendor/guzzle/http/Guzzle/Http/RedirectPlugin.php
View file @
ef326513
...
...
@@ -78,8 +78,10 @@ public function onRequestSent(Event $event)
// Send the redirect request and hijack the response of the original request
$redirectResponse
=
$redirectRequest
->
send
();
$redirectResponse
->
setPreviousResponse
(
$event
[
'response'
]);
$request
->
setResponse
(
$redirectResponse
);
if
(
!
$redirectResponse
->
getPreviousResponse
())
{
$redirectResponse
->
setPreviousResponse
(
$response
);
}
}
/**
...
...
core/vendor/guzzle/http/Guzzle/Http/composer.json
View file @
ef326513
...
...
@@ -13,11 +13,13 @@
],
"require"
:
{
"php"
:
">=5.3.2"
,
"ext-curl"
:
"*"
,
"guzzle/common"
:
"self.version"
,
"guzzle/parser"
:
"self.version"
,
"guzzle/stream"
:
"self.version"
},
"suggest"
:
{
"ext-curl"
:
"*"
},
"autoload"
:
{
"psr-0"
:
{
"Guzzle\\Http"
:
""
}
},
...
...
core/vendor/kriswallsmith/assetic/.travis.yml
deleted
100644 → 0
View file @
e5fbed4c
language
:
php
php
:
-
5.3
-
5.4
before_script
:
-
wget http://getcomposer.org/composer.phar
-
php composer.phar install --dev
-
git clone https://github.com/kamicane/packager.git vendor/packager --quiet --depth
1
-
git clone https://github.com/leafo/lessphp.git vendor/lessphp --quiet --depth
1
-
git clone https://github.com/mrclay/minify.git vendor/minify --quiet --depth
1
-
svn checkout http://cssmin.googlecode.com/svn/trunk/ vendor/cssmin --quiet
-
wget --quiet -O javascript-packer.zip "http://joliclic.free.fr/php/javascript-packer/telechargement.php?id=2&action=telecharger" && mkdir -p vendor/packer && unzip -qq javascript-packer.zip -d vendor/packer; rm javascript-packer.zip
script
:
phpunit --configuration phpunit.travis.xml
core/vendor/kriswallsmith/assetic/CHANGELOG-1.1.md
100644 → 100755
View file @
ef326513
1.1.0
-----
*
Added the possibility to configure additional load paths for less and lessphp
*
Added the UglifyCssFilter
*
Fixed the handling of directories in the GlobAsset. #256
*
Added Handlebars support
*
Added Scssphp-compass support
*
Added the CacheBustingWorker
*
Added the UglifyJs2Filter
1.
1.0-alpha1 (August 28, 2012)
------------------------------
...
...
core/vendor/kriswallsmith/assetic/LICENSE
View file @
ef326513
Copyright (c) 2010-201
2
OpenSky Project Inc
Copyright (c) 2010-201
3
OpenSky Project Inc
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
...
...
Prev
1
2
3
4
5
…
28
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment