Merge branch '5.1' into 5.x

Author: derrabus

Tests/EventDispatcherTest.php

@@ -19,10 +19,9 @@
 class EventDispatcherTest extends TestCase
 {
     /* Some pseudo events */
-    const preFoo = 'pre.foo';
-    const postFoo = 'post.foo';
-    const preBar = 'pre.bar';
-    const postBar = 'post.bar';
+    private const preFoo = 'pre.foo';
+    private const postFoo = 'post.foo';
+    private const preBar = 'pre.bar';
 
     /**
      * @var EventDispatcher