Avoid conflict with parent phpdoc

doctrine · Apr 15, 2020 · cf1563f · cf1563f
1 parent 9d855ee
commit cf1563f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 10 deletions.
diff --git a/baseline.xml b/baseline.xml
@@ -71,16 +71,6 @@
       <code>sqlsrv_get_field($this-&gt;stmt, 0)</code>
     </TooFewArguments>
   </file>
-  <file src="lib/Doctrine/DBAL/Platforms/AbstractPlatform.php">
-    <InvalidParamDefault occurrences="1">
-      <code>int</code>
-    </InvalidParamDefault>
-  </file>
-  <file src="lib/Doctrine/DBAL/Schema/AbstractSchemaManager.php">
-    <InvalidParamDefault occurrences="1">
-      <code>string</code>
-    </InvalidParamDefault>
-  </file>
   <file src="lib/Doctrine/DBAL/Tools/Dumper.php">
     <UndefinedClass occurrences="1">
       <code>Collection</code>

diff --git a/lib/Doctrine/DBAL/Platforms/SqlitePlatform.php b/lib/Doctrine/DBAL/Platforms/SqlitePlatform.php
@@ -807,6 +807,8 @@ public function getCreateConstraintSQL(Constraint $constraint, $table)
 
     /**
      * {@inheritDoc}
+     *
+     * @param int|null $createFlags
      */
     public function getCreateTableSQL(Table $table, $createFlags = null)
     {

diff --git a/lib/Doctrine/DBAL/Schema/OracleSchemaManager.php b/lib/Doctrine/DBAL/Schema/OracleSchemaManager.php
@@ -287,6 +287,8 @@ protected function _getPortableDatabaseDefinition($database)
     /**
      * {@inheritdoc}
      *
+     * @param string|null $database
+     *
      * Calling this method without an argument or by passing NULL is deprecated.
      */
     public function createDatabase($database = null)
-Original file line number
+Diff line change
@@ Expand Up @@
         /**
          * {@inheritDoc}
+         *
+         * @param int|null $createFlags
          */
         public function getCreateTableSQL(Table $table, $createFlags = null)
         {
@@ Expand Down @@