File tree 2 files changed +3
-3
lines changed
src/MagentoHackathon/Composer/Magento/Deploystrategy
tests/MagentoHackathon/Composer/Magento/Deploystrategy
2 files changed +3
-3
lines changed Original file line number Diff line number Diff line change @@ -41,8 +41,8 @@ public function createDelegate($source, $dest)
41
41
// Namespace/ModuleDir => Namespace/, but Namespace/ModuleDir may exist
42
42
// Namespace/ModuleDir => Namespace/ModuleDir, but ModuleDir may exist
43
43
44
- // first iteration through, we need to handle Namespace/ModuleDir => Namespace/ type glob
45
- if ($ mapSource == $ source && $ mapDest == $ this ->removeTrailingSlash ($ dest )) {
44
+ // first iteration through, we need to update the mappings to correctly handle mismatch globs
45
+ if ($ mapSource == $ this -> removeTrailingSlash ( $ source) && $ mapDest == $ this ->removeTrailingSlash ($ dest )) {
46
46
if (basename ($ sourcePath ) !== basename ($ destPath )) {
47
47
$ this ->setCurrentMapping (array ($ mapSource , $ mapDest . '/ ' . basename ($ source )));
48
48
$ cleanDest = $ cleanDest . '/ ' . basename ($ source );
Original file line number Diff line number Diff line change @@ -389,7 +389,7 @@ public function testSourceAndTargetAreDirsDoExist()
389
389
$ this ->mkdir ($ this ->destDir . DS . $ dest );
390
390
391
391
// The target should be created INSIDE the target directory because the target dir exists exist
392
- // This is how bash commands (and therefore modman) process source and targer
392
+ // This is how bash commands (and therefore modman) process source and target
393
393
394
394
$ testTarget = $ this ->destDir . DS . $ dest . DS . basename ($ globSource );
395
395
$ testTargetContent = $ testTarget . DS . $ sourceDirContent ;
You can’t perform that action at this time.
0 commit comments