Skip to content

Commit

Permalink
Composer updates for 3.5 branch
Browse files Browse the repository at this point in the history
  • Loading branch information
mbabker committed Oct 10, 2015
1 parent ec6b027 commit 086541a
Show file tree
Hide file tree
Showing 30 changed files with 587 additions and 337 deletions.
13 changes: 7 additions & 6 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ Desktop.ini
/libraries/vendor/joomla/session/Joomla/Session/_Tests
/libraries/vendor/joomla/session/Joomla/Session/build
/libraries/vendor/joomla/session/Joomla/Session/Tests
/libraries/vendor/joomla/session/Joomla/Session/CONTRIBUTING.md
/libraries/vendor/joomla/session/Joomla/Session/composer.json
/libraries/vendor/joomla/session/Joomla/Session/phpunit.xml.dist
/libraries/vendor/joomla/session/Joomla/Session/README.md
Expand All @@ -101,9 +102,9 @@ Desktop.ini
/libraries/vendor/psr/log/.gitignore
/libraries/vendor/psr/log/composer.json
/libraries/vendor/psr/log/README.md
/libraries/vendor/symfony/yaml/Symfony/Component/Yaml/Tests
/libraries/vendor/symfony/yaml/Symfony/Component/Yaml/.gitignore
/libraries/vendor/symfony/yaml/Symfony/Component/Yaml/CHANGELOG.md
/libraries/vendor/symfony/yaml/Symfony/Component/Yaml/composer.json
/libraries/vendor/symfony/yaml/Symfony/Component/Yaml/phpunit.xml.dist
/libraries/vendor/symfony/yaml/Symfony/Component/Yaml/README.md
/libraries/vendor/symfony/yaml/Tests
/libraries/vendor/symfony/yaml/.gitignore
/libraries/vendor/symfony/yaml/CHANGELOG.md
/libraries/vendor/symfony/yaml/composer.json
/libraries/vendor/symfony/yaml/phpunit.xml.dist
/libraries/vendor/symfony/yaml/README.md
16 changes: 16 additions & 0 deletions administrator/components/com_admin/script.php
Original file line number Diff line number Diff line change
Expand Up @@ -1303,6 +1303,17 @@ public function deleteUnexistingFiles()
'/media/com_joomlaupdate/encryption.js',
'/media/com_joomlaupdate/json2.js',
'/media/com_joomlaupdate/update.js',
'/libraries/vendor/symfony/yaml/Symfony/Component/Yaml/Dumper.php',
'/libraries/vendor/symfony/yaml/Symfony/Component/Yaml/Escaper.php',
'/libraries/vendor/symfony/yaml/Symfony/Component/Yaml/Inline.php',
'/libraries/vendor/symfony/yaml/Symfony/Component/Yaml/LICENSE',
'/libraries/vendor/symfony/yaml/Symfony/Component/Yaml/Parser.php',
'/libraries/vendor/symfony/yaml/Symfony/Component/Yaml/Unescaper.php',
'/libraries/vendor/symfony/yaml/Symfony/Component/Yaml/Yaml.php',
'/libraries/vendor/symfony/yaml/Symfony/Component/Yaml/Exception/DumpException.php',
'/libraries/vendor/symfony/yaml/Symfony/Component/Yaml/Exception/ExceptionInterface.php',
'/libraries/vendor/symfony/yaml/Symfony/Component/Yaml/Exception/ParseException.php',
'/libraries/vendor/symfony/yaml/Symfony/Component/Yaml/Exception/RuntimeException.php',
);

// TODO There is an issue while deleting folders using the ftp mode
Expand Down Expand Up @@ -1388,6 +1399,11 @@ public function deleteUnexistingFiles()
'/administrator/components/com_config/views',
'/administrator/components/com_config/models/fields',
'/administrator/components/com_config/models/forms',
// Joomla! 3.5
'/libraries/vendor/symfony/yaml/Symfony/Component/Yaml/Exception',
'/libraries/vendor/symfony/yaml/Symfony/Component/Yaml',
'/libraries/vendor/symfony/yaml/Symfony/Component',
'/libraries/vendor/symfony/yaml/Symfony',
);

jimport('joomla.filesystem.file');
Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
},
"require": {
"php": ">=5.3.10",
"joomla/application": "~1.4",
"joomla/application": "~1.5",
"joomla/di": "~1.2",
"joomla/event": "~1.1",
"joomla/registry": "~1.4 >=1.4.5",
"joomla/session": "~1.2",
"joomla/session": "~1.3",
"joomla/string": "~1.3",
"joomla/uri": "~1.1",
"joomla/utilities": "~1.3 >=1.3.3",
Expand Down
100 changes: 53 additions & 47 deletions composer.lock

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

8 changes: 4 additions & 4 deletions libraries/vendor/composer/ClassLoader.php
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,7 @@ private function findFileWithExtension($class, $ext)
foreach ($this->prefixLengthsPsr4[$first] as $prefix => $length) {
if (0 === strpos($class, $prefix)) {
foreach ($this->prefixDirsPsr4[$prefix] as $dir) {
if (is_file($file = $dir . DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $length))) {
if (file_exists($file = $dir . DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $length))) {
return $file;
}
}
Expand All @@ -361,7 +361,7 @@ private function findFileWithExtension($class, $ext)

// PSR-4 fallback dirs
foreach ($this->fallbackDirsPsr4 as $dir) {
if (is_file($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) {
if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) {
return $file;
}
}
Expand All @@ -380,7 +380,7 @@ private function findFileWithExtension($class, $ext)
foreach ($this->prefixesPsr0[$first] as $prefix => $dirs) {
if (0 === strpos($class, $prefix)) {
foreach ($dirs as $dir) {
if (is_file($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
return $file;
}
}
Expand All @@ -390,7 +390,7 @@ private function findFileWithExtension($class, $ext)

// PSR-0 fallback dirs
foreach ($this->fallbackDirsPsr0 as $dir) {
if (is_file($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
return $file;
}
}
Expand Down
Loading

0 comments on commit 086541a

Please sign in to comment.