Fix some merge artifacts

... from merging the 3.x commits into the 4.x branch.

Author: jrfnl

tests/Core/File/GetMemberPropertiesTest.php

@@ -593,8 +593,6 @@ public function dataGetMemberProperties()
                     'scope_specified' => true,
                     'is_static'       => false,
                     'is_readonly'     => false,
-                    // Missing static, but that's OK as not an allowed syntax.
-                    'is_readonly'     => false,
                     'type'            => 'callable||void',
                     'nullable_type'   => false,
                 ],

tests/Core/File/GetMethodParametersTest.php

@@ -1026,7 +1026,6 @@ public function testCommentsInParameter()
             'variable_length'   => true,
             'type_hint'         => '?MyClass',
             'nullable_type'     => true,
-            'default'           => '\'default value\' . /*-*/ \'second part\' // Trailing comment.',
         ];
 
         $this->getMethodParametersTestHelper('/* '.__FUNCTION__.' */', $expected);