fixed various inconsistencies

update year on licenses
Merge branch '2.2' into 2.3
2026-04-24 01:08:03 +02: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
3 changed files with 4 additions and 3 deletions
@@ -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
@@ -189,7 +189,7 @@ class ClassCollectionLoaderTest extends \PHPUnit_Framework_TestCase
    }

    /**
-     * @expectedException InvalidArgumentException
+     * @expectedException \InvalidArgumentException
     */
    public function testUnableToLoadClassException()
    {
@@ -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
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