Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
name: Tests

on:
push:
pull_request:
schedule:
- cron: '13 4 * * *'
on: [ push, pull_request ]

jobs:
build:
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/.ddev
/.php_cs.cache
/.idea
/vendor
/composer.lock
/vendor
18 changes: 10 additions & 8 deletions src/ClassAliasLoader.php
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,9 @@ public function loadClassWithAlias($className)
{
$originalClassName = $this->getOriginalClassName($className);

return $originalClassName ? $this->loadOriginalClassAndSetAliases($originalClassName) : $this->loadClass($className);
return $originalClassName
? $this->loadOriginalClassAndSetAliases($originalClassName)
: $this->loadClass($className);
}

/**
Expand Down Expand Up @@ -149,19 +151,19 @@ protected function getOriginalClassName($aliasOrClassName)
{
// Is an original class which has an alias
if (array_key_exists($aliasOrClassName, $this->aliasMap['classNameToAliasMapping'])) {
if ($this->aliasMap['classNameToAliasMapping'][$aliasOrClassName] === null) {
return null;
}
return $aliasOrClassName;
return $this->aliasMap['classNameToAliasMapping'][$aliasOrClassName] === array()
? null
: $aliasOrClassName
;
}

// Is an alias (we're graceful regarding casing for alias definitions)
// Is an alias (we're graceful ignoring casing for alias definitions)
$lowerCasedClassName = strtolower($aliasOrClassName);
if (array_key_exists($lowerCasedClassName, $this->aliasMap['aliasToClassNameMapping'])) {
return $this->aliasMap['aliasToClassNameMapping'][$lowerCasedClassName];
}
// No alias registered for this class name, return and remember that info
return $this->aliasMap['classNameToAliasMapping'][$aliasOrClassName] = null;
$this->aliasMap['classNameToAliasMapping'][$aliasOrClassName] = array();
return null;
}

/**
Expand Down
16 changes: 15 additions & 1 deletion tests/Unit/ClassAliasLoaderTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
*/

use Composer\Autoload\ClassLoader as ComposerClassLoader;
use PHPUnit\Framework\MockObject\MockObject;
use TYPO3\ClassAliasLoader\ClassAliasLoader;

/**
Expand All @@ -24,7 +25,7 @@ class ClassAliasLoaderTest extends BaseTestCase
protected $subject;

/**
* @var ComposerClassLoader|\PHPUnit_Framework_MockObject_MockObject
* @var ComposerClassLoader|MockObject|PHPUnit_Framework_MockObject_MockObject
*/
protected $composerClassLoaderMock;

Expand Down Expand Up @@ -97,6 +98,19 @@ public function loadsClassIfNoAliasIsFound()
$this->assertTrue(class_exists($testClassName, false));
}

/**
* @test
*/
public function callingLoadClassMultipleTimesInEdgeCasesWillStillWork()
{
$this->composerClassLoaderMock
->expects($this->exactly(2))
->method('loadClass')
->willReturnOnConsecutiveCalls(false, true);
$this->assertFalse($this->subject->loadClassWithAlias('TestClass'));
$this->assertTrue($this->subject->loadClassWithAlias('TestClass'));
}

/**
* @test
*/
Expand Down