Strict standards fix

src/Propel/Generator/Builder/Sql/DataSQLBuilder.php

@@ -11,6 +11,8 @@
 namespace Propel\Generator\Builder\Sql;
 
 use Propel\Generator\Builder\DataModelBuilder;
+use Propel\Generator\Builder\Util\ColumnValue;
+use Propel\Generator\Builder\Util\DataRow;
 use Propel\Generator\Model\PropelTypes;
 
 /**

src/Propel/Generator/Builder/Sql/Pgsql/PgsqlDataSQLBuilder.php

@@ -11,6 +11,8 @@
 namespace Propel\Generator\Builder\Sql\Pgsql;
 
 use Propel\Generator\Builder\Sql\DataSQLBuilder;
+use Propel\Generator\Builder\Util\ColumnValue;
+use Propel\Generator\Builder\Util\DataRow;
 
 /**
  * PostgreSQL class for building data dump SQL.
@@ -102,5 +104,4 @@ protected function getBlobSql($blob)
 
         return "'" . pg_escape_bytea($blob) . "'";
     }
-
-}
+}

src/Propel/Generator/Builder/Util/ColumnValue.php

@@ -0,0 +1,37 @@
+<?php
+
+/**
+ * This file is part of the Propel package.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @license    MIT License
+ */
+
+namespace Propel\Generator\Builder\Util;
+
+use Propel\Generator\Model\Column;
+
+class ColumnValue
+{
+
+    private $col;
+
+    private $val;
+
+    public function __construct(Column $col, $val)
+    {
+        $this->col = $col;
+        $this->val = $val;
+    }
+
+    public function getColumn()
+    {
+        return $this->col;
+    }
+
+    public function getValue()
+    {
+        return $this->val;
+    }
+}

src/Propel/Generator/Builder/Util/DataRow.php

@@ -0,0 +1,35 @@
+<?php
+
+/**
+ * This file is part of the Propel package.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @license    MIT License
+ */
+
+namespace Propel\Generator\Builder\Util;
+
+use Propel\Generator\Model\Table;
+
+class DataRow
+{
+    private $table;
+    private $columnValues;
+
+    public function __construct(Table $table, $columnValues)
+    {
+        $this->table = $table;
+        $this->columnValues = $columnValues;
+    }
+
+    public function getTable()
+    {
+        return $this->table;
+    }
+
+    public function getColumnValues()
+    {
+        return $this->columnValues;
+    }
+}

src/Propel/Generator/Builder/Util/PropelStringReader.php

@@ -10,7 +10,9 @@
 
 namespace Propel\Generator\Builder\Util;
 
+// @TODO remove
 include_once 'phing/system/io/Reader.php';
+use Reader;
 
 /**
  * Overrides Phing's StringReader to allow inclusin inside a BufferedReader
@@ -53,15 +55,16 @@ public function read($len = null)
     {
         if ($len === null) {
             return $this->_string;
-        } else {
-            if ($this->currPos >= strlen($this->_string)) {
-                return -1;
-            }
-            $out = substr($this->_string, $this->currPos, $len);
-            $this->currPos += $len;
-
-            return $out;
         }
+
+        if ($this->currPos >= strlen($this->_string)) {
+            return -1;
+        }
+
+        $out = substr($this->_string, $this->currPos, $len);
+        $this->currPos += $len;
+
+        return $out;
     }
 
     public function mark()
@@ -74,11 +77,20 @@ public function reset()
         $this->currPos = $this->mark;
     }
 
-    public function close() {}
+    public function close()
+    {
+
+    }
 
-    public function open() {}
+    public function open()
+    {
+
+    }
 
-    public function ready() {}
+    public function ready()
+    {
+
+    }
 
     public function markSupported()
     {

src/Propel/Generator/Builder/Util/XmlToDataSQL.php

@@ -17,7 +17,7 @@
  *
  * @author     Hans Lellelid <hans@xmpl.org> (Propel)
  */
-class XmlToDataSQL extends AbstractHandler
+class XmlToDataSQL extends \AbstractHandler
 {
 
     /**
@@ -210,54 +210,4 @@ public function endElement($name)
         }
     }
 
-} // XmlToData
-
-/**
- * "inner class"
- */
-class DataRow
-{
-    private $table;
-    private $columnValues;
-
-    public function __construct(Table $table, $columnValues)
-    {
-        $this->table = $table;
-        $this->columnValues = $columnValues;
-    }
-
-    public function getTable()
-    {
-        return $this->table;
-    }
-
-    public function getColumnValues()
-    {
-        return $this->columnValues;
-    }
-}
-
-/**
- * "inner" class
- */
-class ColumnValue {
-
-    private $col;
-    private $val;
-
-    public function __construct(Column $col, $val)
-    {
-        $this->col = $col;
-        $this->val = $val;
-    }
-
-    public function getColumn()
-    {
-        return $this->col;
-    }
-
-    public function getValue()
-    {
-        return $this->val;
-    }
-}
+}

src/Propel/Generator/Model/Column.php

@@ -10,12 +10,11 @@
 
 namespace Propel\Generator\Model;
 
+use DOMNode;
+use DOMDocument;
 use Propel\Generator\Exception\EngineException;
 use Propel\Generator\Platform\PlatformInterface;
 
-use \DOMNode;
-use \DOMDocument;
-
 /**
  * A Class for holding data about a column used in an Application.
  *
@@ -29,19 +28,28 @@
  */
 class Column extends XmlElement
 {
-
     const DEFAULT_TYPE = "VARCHAR";
+
     const DEFAULT_VISIBILITY = 'public';
+
     static public $validVisibilities = array('public', 'protected', 'private');
 
     private $name;
+
     private $description;
+
     private $phpName = null;
+
     private $phpNamingMethod;
+
     private $isNotNull = false;
+
     private $size;
+
     private $namePrefix;
+
     private $accessorVisibility;
+
     private $mutatorVisibility;
 
     /**

src/Propel/Generator/Model/Table.php

@@ -10,12 +10,11 @@
 
 namespace Propel\Generator\Model;
 
+use DOMNode;
+use DOMDocument;
 use Propel\Generator\Exception\EngineException;
 use Propel\Generator\Platform\MysqlPlatform;
 
-use \DOMNode;
-use \DOMDocument;
-
 /**
  * Data about a table used in an application.
  *

src/Propel/Generator/Platform/DefaultPlatform.php

@@ -1172,7 +1172,7 @@ public function getDateFormatter()
 
     /**
      * Get the PHP snippet for binding a value to a column.
-     * Warning: duplicates logic from AbstractAdapter::bindValue().
+     * Warning: duplicates logic from AdapterInterface::bindValue().
      * Any code modification here must be ported there.
      */
     public function getColumnBindingPHP($column, $identifier, $columnValueAccessor, $tab = "            ")
@@ -1202,7 +1202,7 @@ public function getColumnBindingPHP($column, $identifier, $columnValueAccessor,
 
     /**
      * Get the PHP snippet for getting a Pk from the database.
-     * Warning: duplicates logic from AbstractAdapter::getId().
+     * Warning: duplicates logic from AdapterInterface::getId().
      * Any code modification here must be ported there.
      *
      * Typical output:

src/Propel/Generator/Reverse/MssqlSchemaParser.php

@@ -10,10 +10,15 @@
 
 namespace Propel\Generator\Reverse;
 
-use Propel\Generator\Model\PropelTypes;
-use Propel\Generator\Reverse\AbstractSchemaParser;
+// TODO: to remove
+require_once 'phing/Task.php';
+use Task;
 
 use PDO;
+use Propel\Generator\Model\Table;
+use Propel\Generator\Model\Database;
+use Propel\Generator\Model\PropelTypes;
+use Propel\Generator\Reverse\AbstractSchemaParser;
 
 /**
  * Microsoft SQL Server database schema parser.

src/Propel/Generator/Reverse/MysqlSchemaParser.php

@@ -10,18 +10,17 @@
 
 namespace Propel\Generator\Reverse;
 
+// TODO: to remove
+require_once 'phing/Task.php';
+use Task;
+
+use PDO;
 use Propel\Generator\Model\Column;
 use Propel\Generator\Model\Database;
 use Propel\Generator\Model\Table;
 use Propel\Generator\Model\PropelTypes;
 use Propel\Generator\Model\ColumnDefaultValue;
 
-use \PDO;
-
-// TODO: to remove
-require_once 'phing/Task.php';
-use \Task;
-
 /**
  * Mysql database schema parser.
  *

src/Propel/Generator/Reverse/OracleSchemaParser.php

@@ -10,11 +10,16 @@
 
 namespace Propel\Generator\Reverse;
 
+// TODO: to remove
+require_once 'phing/Task.php';
+use Task;
+
+use PDO;
+use Propel\Generator\Model\Column;
+use Propel\Generator\Model\Database;
 use Propel\Generator\Model\PropelTypes;
 use Propel\Generator\Reverse\AbstractSchemaParser;
 
-use \PDO;
-
 /**
  * Oracle database schema parser.
  *
@@ -285,5 +290,4 @@ protected function addPrimaryKey(Table $table)
         }
     }
 
-}
-
+}

src/Propel/Generator/Reverse/PgsqlSchemaParser.php

@@ -10,11 +10,17 @@
 
 namespace Propel\Generator\Reverse;
 
+// TODO: to remove
+require_once 'phing/Task.php';
+use Task;
+
+use PDO;
+use Propel\Generator\Model\Column;
+use Propel\Generator\Model\Database;
+use Propel\Generator\Model\Table;
 use Propel\Generator\Model\PropelTypes;
 use Propel\Generator\Reverse\AbstractSchemaParser;
 
-use \PDO;
-
 /**
  * Postgresql database schema parser.
  *