Fix class names in ApcUniversalClassLoader tests.

fixed various inconsistencies
update year on licenses
2026-03-24 17:22:11 +01:00 · 2014-03-29 07:58:16 +01:00 · 2014-02-11 11:29:24 +01:00 · 2014-01-07 08:19:25 -05:00 · 2013-11-25 15:49:41 +01:00 · 2013-11-25 09:44:14 +01:00
8 changed files with 14 additions and 16 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
 vendor/
 composer.lock
 phpunit.xml
-
--- a/ClassLoader.php
+++ b/ClassLoader.php
@@ -177,7 +177,7 @@ class ClassLoader
        $classPath .= str_replace('_', DIRECTORY_SEPARATOR, $className).'.php';

        foreach ($this->prefixes as $prefix => $dirs) {
-            if (0 === strpos($class, $prefix)) {
+            if ($class === strstr($class, $prefix)) {
                foreach ($dirs as $dir) {
                    if (file_exists($dir.DIRECTORY_SEPARATOR.$classPath)) {
                        return $dir.DIRECTORY_SEPARATOR.$classPath;
--- a/ClassMapGenerator.php
+++ b/ClassMapGenerator.php
@@ -39,7 +39,7 @@ class ClassMapGenerator
    /**
     * Iterate over all files in the given directory searching for classes
     *
-     * @param Iterator|string $dir The directory to search in or an iterator
+     * @param \Iterator|string $dir The directory to search in or an iterator
     *
     * @return array A class map array
     */
--- a/2
+++ b/2
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2013 Fabien Potencier
+Copyright (c) 2004-2014 Fabien Potencier

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
--- a/README.md
+++ b/README.md
@@ -65,5 +65,5 @@ Resources
 You can run the unit tests with the following command:

    $ cd path/to/Symfony/Component/ClassLoader/
-    $ composer.phar install --dev
+    $ composer.phar install
    $ phpunit
--- a/Tests/ApcUniversalClassLoaderTest.php
+++ b/Tests/ApcUniversalClassLoaderTest.php
@@ -58,10 +58,8 @@ class ApcUniversalClassLoaderTest extends \PHPUnit_Framework_TestCase
   public function getLoadClassTests()
   {
       return array(
-           array('\\Apc\\Namespaced\\Foo', '\\Apc\\Namespaced\\Foo',   '->loadClass() loads Apc\Namespaced\Foo class'),
+           array('\\Apc\\Namespaced\\Foo', 'Apc\\Namespaced\\Foo',   '->loadClass() loads Apc\Namespaced\Foo class'),
           array('Apc_Pearlike_Foo',    'Apc_Pearlike_Foo',      '->loadClass() loads Apc_Pearlike_Foo class'),
-           array('\\Apc\\Namespaced\\Bar', '\\Apc\\Namespaced\\Bar', '->loadClass() loads Apc\Namespaced\Bar class with a leading slash'),
-           array('Apc_Pearlike_Bar',    '\\Apc_Pearlike_Bar',    '->loadClass() loads Apc_Pearlike_Bar class with a leading slash'),
       );
   }

@@ -82,9 +80,9 @@ class ApcUniversalClassLoaderTest extends \PHPUnit_Framework_TestCase
   public function getLoadClassFromFallbackTests()
   {
       return array(
-           array('\\Apc\\Namespaced\\Baz',    '\\Apc\\Namespaced\\Baz',    '->loadClass() loads Apc\Namespaced\Baz class'),
+           array('\\Apc\\Namespaced\\Baz',    'Apc\\Namespaced\\Baz',    '->loadClass() loads Apc\Namespaced\Baz class'),
           array('Apc_Pearlike_Baz',       'Apc_Pearlike_Baz',       '->loadClass() loads Apc_Pearlike_Baz class'),
-           array('\\Apc\\Namespaced\\FooBar', '\\Apc\\Namespaced\\FooBar', '->loadClass() loads Apc\Namespaced\Baz class from fallback dir'),
+           array('\\Apc\\Namespaced\\FooBar', 'Apc\\Namespaced\\FooBar', '->loadClass() loads Apc\Namespaced\Baz class from fallback dir'),
           array('Apc_Pearlike_FooBar',    'Apc_Pearlike_FooBar',    '->loadClass() loads Apc_Pearlike_Baz class from fallback dir'),
       );
   }
@@ -110,7 +108,7 @@ class ApcUniversalClassLoaderTest extends \PHPUnit_Framework_TestCase
                   'Apc\\NamespaceCollision\\A' => __DIR__.DIRECTORY_SEPARATOR.'Fixtures/Apc/alpha',
                   'Apc\\NamespaceCollision\\A\\B' => __DIR__.DIRECTORY_SEPARATOR.'Fixtures/Apc/beta',
               ),
-               '\Apc\NamespaceCollision\A\Foo',
+               'Apc\NamespaceCollision\A\Foo',
               '->loadClass() loads NamespaceCollision\A\Foo from alpha.',
           ),
           array(
@@ -118,7 +116,7 @@ class ApcUniversalClassLoaderTest extends \PHPUnit_Framework_TestCase
                   'Apc\\NamespaceCollision\\A\\B' => __DIR__.DIRECTORY_SEPARATOR.'Fixtures/Apc/beta',
                   'Apc\\NamespaceCollision\\A' => __DIR__.DIRECTORY_SEPARATOR.'Fixtures/Apc/alpha',
               ),
-               '\Apc\NamespaceCollision\A\Bar',
+               'Apc\NamespaceCollision\A\Bar',
               '->loadClass() loads NamespaceCollision\A\Bar from alpha.',
           ),
           array(
@@ -126,7 +124,7 @@ class ApcUniversalClassLoaderTest extends \PHPUnit_Framework_TestCase
                   'Apc\\NamespaceCollision\\A' => __DIR__.DIRECTORY_SEPARATOR.'Fixtures/Apc/alpha',
                   'Apc\\NamespaceCollision\\A\\B' => __DIR__.DIRECTORY_SEPARATOR.'Fixtures/Apc/beta',
               ),
-               '\Apc\NamespaceCollision\A\B\Foo',
+               'Apc\NamespaceCollision\A\B\Foo',
               '->loadClass() loads NamespaceCollision\A\B\Foo from beta.',
           ),
           array(
@@ -134,7 +132,7 @@ class ApcUniversalClassLoaderTest extends \PHPUnit_Framework_TestCase
                   'Apc\\NamespaceCollision\\A\\B' => __DIR__.DIRECTORY_SEPARATOR.'Fixtures/Apc/beta',
                   'Apc\\NamespaceCollision\\A' => __DIR__.DIRECTORY_SEPARATOR.'Fixtures/Apc/alpha',
               ),
-               '\Apc\NamespaceCollision\A\B\Bar',
+               'Apc\NamespaceCollision\A\B\Bar',
               '->loadClass() loads NamespaceCollision\A\B\Bar from beta.',
           ),
       );
--- a/Tests/ClassCollectionLoaderTest.php
+++ b/Tests/ClassCollectionLoaderTest.php
@@ -189,7 +189,7 @@ class ClassCollectionLoaderTest extends \PHPUnit_Framework_TestCase
    }

    /**
-     * @expectedException InvalidArgumentException
+     * @expectedException \InvalidArgumentException
     */
    public function testUnableToLoadClassException()
    {
--- a/XcacheClassLoader.php
+++ b/XcacheClassLoader.php
@@ -116,7 +116,8 @@ class XcacheClassLoader
        if (xcache_isset($this->prefix.$class)) {
            $file = xcache_get($this->prefix.$class);
        } else {
-            xcache_set($this->prefix.$class, $file = $this->classFinder->findFile($class));
+            $file = $this->classFinder->findFile($class);
+            xcache_set($this->prefix.$class, $file);
        }

        return $file;
Author	SHA1	Message	Date
Ioan Negulescu	142de518bf	Fix class names in ApcUniversalClassLoader tests.	2014-03-29 07:58:16 +01:00
Fabien Potencier	8a70d1963f	fixed various inconsistencies	2014-02-11 11:29:24 +01:00
Luis Cordova	18d1b5e575	update year on licenses	2014-01-07 08:19:25 -05:00
Fabien Potencier	181f15a84f	Merge branch '2.2' into 2.3 * 2.2: fixed some typos fixed @expectedException class names Conflicts: src/Symfony/Component/Config/Tests/Definition/ArrayNodeTest.php src/Symfony/Component/Console/Tests/Command/CommandTest.php src/Symfony/Component/Locale/Tests/Stub/StubLocaleTest.php src/Symfony/Component/Locale/Tests/Stub/StubNumberFormatterTest.php	2013-11-25 15:49:41 +01:00
Fabien Potencier	0a5217edb6	fixed @expectedException class names	2013-11-25 09:44:14 +01:00
Fabien Potencier	e5f3ef7ebd	Merge branch '2.2' into 2.3 * 2.2: Fix some annotates [FrameworkBundle] made sure that the debug event dispatcher is used everywhere [HttpKernel] remove unneeded strtoupper updated the composer install command to reflect changes in Composer Conflicts: src/Symfony/Component/Console/Application.php src/Symfony/Component/Console/Command/Command.php src/Symfony/Component/Console/Input/InputDefinition.php src/Symfony/Component/CssSelector/Node/CombinedSelectorNode.php src/Symfony/Component/Form/Form.php src/Symfony/Component/HttpKernel/Debug/ErrorHandler.php src/Symfony/Component/HttpKernel/DependencyInjection/RegisterListenersPass.php src/Symfony/Component/HttpKernel/Tests/DependencyInjection/RegisterListenersPassTest.php src/Symfony/Component/Locale/Locale.php src/Symfony/Component/Locale/README.md src/Symfony/Component/Locale/Stub/DateFormat/FullTransformer.php	2013-09-19 11:45:20 +02:00
bronze1man	77f69969b1	Fix some annotates	2013-09-19 11:36:05 +02:00
Fabien Potencier	8478872572	updated the composer install command to reflect changes in Composer	2013-09-18 09:27:26 +02:00
Fabien Potencier	622d370a07	Merge branch '2.2' into 2.3 * 2.2: corrected English grammar (s/does not exists/does not exist) [Process] Add more precision to Process::stop timeout [Process] Avoid zombie process in case of unit tests failure [Process] Fix #8739 [Process] Add failing test for #8739 [Process] Fix CS Fixed documentation grammar for AuthenticationManagerInterface::authenticate() [Validator] fixed the wrong isAbstract() check against the class (fixed #8589) [TwigBridge] Prevent code extension to display warning Use strstr instead of strpos Conflicts: src/Symfony/Component/Finder/Shell/Command.php src/Symfony/Component/Process/Process.php	2013-08-13 22:18:00 +02:00
Lee Rowlands	827c54ee98	Use strstr instead of strpos	2013-08-09 09:16:43 +02:00
Martin Hasoň	7ffb15eeff	Added missing files .gitignore	2013-07-21 14:12:18 +02:00