Skip to content

Commit

Permalink
Unit Test Updates (joomla#14541)
Browse files Browse the repository at this point in the history
* Bump PHPUnit minimum to 4.8.35

* Extend namespaced test case

* Move files that don't need to be in nested directories

* Remove outdated test changelog
  • Loading branch information
mbabker authored and rdeutz committed Mar 19, 2017
1 parent c11e87c commit 7694d92
Show file tree
Hide file tree
Showing 253 changed files with 393 additions and 1,238 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"simplepie/simplepie": "1.3.1"
},
"require-dev": {
"phpunit/phpunit": "4.*",
"phpunit/phpunit": "^4.8.35",
"phpunit/dbunit": "~1.3",
"friendsofphp/php-cs-fixer": "~1.11",
"squizlabs/php_codesniffer": "~1.5",
Expand Down
77 changes: 41 additions & 36 deletions composer.lock

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

10 changes: 7 additions & 3 deletions libraries/vendor/composer/ClassLoader.php
Original file line number Diff line number Diff line change
Expand Up @@ -374,9 +374,13 @@ private function findFileWithExtension($class, $ext)

$first = $class[0];
if (isset($this->prefixLengthsPsr4[$first])) {
foreach ($this->prefixLengthsPsr4[$first] as $prefix => $length) {
if (0 === strpos($class, $prefix)) {
foreach ($this->prefixDirsPsr4[$prefix] as $dir) {
$subPath = $class;
while (false !== $lastPos = strrpos($subPath, '\\')) {
$subPath = substr($subPath, 0, $lastPos);
$search = $subPath.'\\';
if (isset($this->prefixDirsPsr4[$search])) {
foreach ($this->prefixDirsPsr4[$search] as $dir) {
$length = $this->prefixLengthsPsr4[$first][$search];
if (file_exists($file = $dir . DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $length))) {
return $file;
}
Expand Down
2 changes: 1 addition & 1 deletion libraries/vendor/composer/LICENSE
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

Copyright (c) 2016 Nils Adermann, Jordi Boggiano
Copyright (c) Nils Adermann, Jordi Boggiano

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
Loading

0 comments on commit 7694d92

Please sign in to comment.