Merge branch 'release/v2.4.2' into 2.4

Merged hotfix commits in master till 434c364

Author: Ocramius

.gitignore

@@ -5,5 +5,6 @@ dist/
 tests/Doctrine/Tests/Common/Proxy/generated/
 vendor/
 .idea
+composer.lock
 doctrine-common-*.tar
 doctrine-common-*.tar.gz

.travis.yml

@@ -5,6 +5,14 @@ php:
   - 5.3
   - 5.4
   - 5.5
+  - hhvm
 
 before_script:
-    - composer --prefer-source install
+  - composer --prefer-source install
+
+script:
+  - ./vendor/bin/phpunit
+
+matrix:
+  allow_failures:
+     - php: hhvm

README.md

@@ -7,6 +7,6 @@ The Doctrine Common project is a library that provides extensions to core PHP fu
 ## More resources:
 
 * [Website](http://www.doctrine-project.org)
-* [Documentation](http://www.doctrine-project.org/projects/common/current/docs/en)
+* [Documentation](http://docs.doctrine-project.org/projects/doctrine-common/en/latest/)
 * [Issue Tracker](http://www.doctrine-project.org/jira/browse/DCOM)
 * [Downloads](http://github.com/doctrine/common/downloads)

composer.json

@@ -20,6 +20,10 @@
         "doctrine/lexer": "1.*",
         "doctrine/annotations": "1.*"
     },
+    "minimum-stability": "dev",
+    "require-dev": {
+        "phpunit/phpunit": "~3.7"
+    },
     "autoload": {
         "psr-0": { "Doctrine\\Common\\": "lib/" }
     },

composer.lock

@@ -127,7 +127,7 @@ public function removeEventListener($events, $listener)
     }
 
     /**
-     * Adds an EventSubscriber. The subscriber is asked for all the events he is
+     * Adds an EventSubscriber. The subscriber is asked for all the events it is
      * interested in and added as a listener for these events.
      *
      * @param \Doctrine\Common\EventSubscriber $subscriber The subscriber.

lib/Doctrine/Common/EventManager.php

@@ -228,6 +228,7 @@ public function getAllClassNames()
                 foreach ($this->excludePaths as $excludePath) {
                     $exclude = str_replace('\\', '/', realpath($excludePath));
                     $current = str_replace('\\', '/', $sourceFile);
+
                     if (strpos($current, $exclude) !== false) {
                         continue 2;
                     }

lib/Doctrine/Common/Persistence/Mapping/Driver/AnnotationDriver.php

@@ -30,7 +30,7 @@
 interface ObjectManager
 {
     /**
-     * Finds a object by its identifier.
+     * Finds an object by its identifier.
      *
      * This is just a convenient shortcut for getRepository($className)->find($id).
      *