Merge pull request #1612 from spryker/cleanup

Cleanup PHP versioning mentioned.

Author: dereuromark

composer.json

@@ -1,7 +1,7 @@
 {
     "name": "propel/propel",
     "type": "library",
-    "description": "Propel2 is an open-source Object-Relational Mapping (ORM) for PHP 5.5 and up.",
+    "description": "Propel2 is an open-source Object-Relational Mapping (ORM) for PHP.",
     "keywords": [
         "ORM",
         "persistence",

resources/xsd/database.xsd

@@ -646,7 +646,7 @@
         <xs:attribute name="namespace" type="php_namespace" use="optional">
             <xs:annotation>
                 <xs:documentation xml:lang="en">
-                    The PHP 5.3 namespace to use for the generated model classes.
+                    The PHP namespace to use for the generated model classes.
                 </xs:documentation>
             </xs:annotation>
         </xs:attribute>
@@ -844,7 +844,7 @@
         <xs:attribute name="namespace" type="php_namespace" use="optional">
             <xs:annotation>
                 <xs:documentation xml:lang="en">
-                    The PHP 5.3 namespace to use for the generated model classes of the database. Can be overridden on a per-table basis.
+                    The PHP namespace to use for the generated model classes of the database. Can be overridden on a per-table basis.
                 </xs:documentation>
             </xs:annotation>
         </xs:attribute>

src/Propel/Generator/Builder/Om/AbstractObjectBuilder.php

@@ -26,7 +26,7 @@ abstract class AbstractObjectBuilder extends AbstractOMBuilder
     /**
      * Adds the getter methods for the column values.
      * This is here because it is probably generic enough to apply to templates being generated
-     * in different languages (e.g. PHP4 and PHP5).
+     * in different PHP versions.
      * @param string &$script The script will be modified in this method.
      */
     protected function addColumnAccessorMethods(&$script)
@@ -73,7 +73,7 @@ protected function addColumnAccessorMethods(&$script)
     /**
      * Adds the mutator (setter) methods for setting column values.
      * This is here because it is probably generic enough to apply to templates being generated
-     * in different languages (e.g. PHP4 and PHP5).
+     * in different PHP versions.
      * @param string &$script The script will be modified in this method.
      */
     protected function addColumnMutatorMethods(&$script)

src/Propel/Generator/Builder/Om/ExtensionObjectBuilder.php

@@ -11,7 +11,7 @@
 namespace Propel\Generator\Builder\Om;
 
 /**
- * Generates the empty PHP5 stub object class for user object model (OM).
+ * Generates the empty stub object class for user object model (OM).
  *
  * This class produces the empty stub class that can be customized with application
  * business logic, custom behavior, etc.

src/Propel/Generator/Builder/Om/ExtensionQueryBuilder.php

@@ -11,7 +11,7 @@
 namespace Propel\Generator\Builder\Om;
 
 /**
- * Generates the empty PHP5 stub class for object query
+ * Generates the empty stub class for object query
  *
  * This class produces the empty stub class that can be customized with application
  * business logic, custom behavior, etc.

src/Propel/Generator/Builder/Om/ExtensionQueryInheritanceBuilder.php

@@ -14,7 +14,7 @@
 use Propel\Generator\Exception\BuildException;
 
 /**
- * Generates the empty PHP5 stub query class for use with single table inheritance.
+ * Generates the empty stub query class for use with single table inheritance.
  *
  * This class produces the empty stub class that can be customized with
  * application business logic, custom behavior, etc.

src/Propel/Generator/Builder/Om/InterfaceBuilder.php

@@ -11,7 +11,7 @@
 namespace Propel\Generator\Builder\Om;
 
 /**
- * Generates the empty PHP5 stub interface for user object model (OM).
+ * Generates the empty stub interface for user object model (OM).
  *
  * This class produces the empty stub interface when the interface="" attribute is used
  * in the the schema xml.

src/Propel/Generator/Builder/Om/MultiExtendObjectBuilder.php

@@ -14,7 +14,7 @@
 use Propel\Generator\Model\Inheritance;
 
 /**
- * Generates the empty PHP5 stub object class for use with inheritance in the
+ * Generates the empty stub object class for use with inheritance in the
  * user object model (OM).
  *
  * This class produces the empty stub class that can be customized with

src/Propel/Generator/Builder/Om/ObjectBuilder.php

@@ -26,7 +26,7 @@
 use Propel\Runtime\Exception\PropelException;
 
 /**
- * Generates a PHP5 base Object class for user object model (OM).
+ * Generates a base Object class for user object model (OM).
  *
  * This class produces the base object class (e.g. BaseMyTable) which contains
  * all the custom-built accessor and setter methods.
@@ -1283,7 +1283,7 @@ protected function addSetAccessorBody(&$script, Column $column)
                 throw new PropelException('Unknown stored set key: ' . \$e->getValue(), \$e->getCode(), \$e);
             }
         }
-        
+
         return \$this->$cloConverted;";
     }
 
@@ -6171,7 +6171,7 @@ protected function addSaveBody(&$script)
         if (\$this->alreadyInSave) {
             return 0;
         }
- 
+
         if (\$con === null) {
             \$con = Propel::getServiceContainer()->getWriteConnection(".$this->getTableMapClass()."::DATABASE_NAME);
         }

src/Propel/Generator/Builder/Om/QueryBuilder.php

@@ -17,7 +17,7 @@
 use Propel\Generator\Model\Table;
 
 /**
- * Generates a PHP5 base Query class for user object model (OM).
+ * Generates a base Query class for user object model (OM).
  *
  * This class produces the base query class (e.g. BaseBookQuery) which contains
  * all the custom-built query methods.
@@ -1092,7 +1092,7 @@ public function filterBy$colPhpName(\$$variableName = null, \$comparison = null)
                 \$this->add(\$key, \${$variableName}, Criteria::BINARY_NONE);
             }
             \$this->addOr(\$key, null, Criteria::ISNULL);
-            
+
             return \$this;
         }";
         } elseif ($col->getType() == PropelTypes::ENUM) {

src/Propel/Generator/Builder/Om/QueryInheritanceBuilder.php

@@ -14,7 +14,7 @@
 use Propel\Generator\Model\Inheritance;
 
 /**
- * Generates the empty PHP5 stub query class for use with single table
+ * Generates the empty stub query class for use with single table
  * inheritance.
  *
  * This class produces the empty stub class that can be customized with
@@ -84,7 +84,7 @@ public function setChild(Inheritance $child)
     public function getChild()
     {
         if (!$this->child) {
-            throw new BuildException("The PHP5MultiExtendObjectBuilder needs to be told which child class to build (via setChild() method) before it can build the stub class.");
+            throw new BuildException("The MultiExtendObjectBuilder needs to be told which child class to build (via setChild() method) before it can build the stub class.");
         }
 
         return $this->child;

src/Propel/Generator/Builder/Om/TableMapBuilder.php

@@ -16,7 +16,7 @@
 use Propel\Generator\Platform\PlatformInterface;
 
 /**
- * Generates the PHP5 table map class for user object model (OM).
+ * Generates the table map class for user object model (OM).
  *
  * @author Hans Lellelid <[email protected]>
  */

tests/Propel/Tests/Helpers/Bookstore/BookstoreTestBase.php

@@ -24,7 +24,7 @@ abstract class BookstoreTestBase extends TestCaseFixturesDatabase
      */
     protected static $isInitialized = false;
     /**
-     * @var \PDO
+     * @var \PDO|\Propel\Runtime\Connection\ConnectionWrapper
      */
     protected $con;
 

tests/Propel/Tests/Runtime/Map/GeneratedRelationMapTest.php

@@ -15,8 +15,6 @@
 use Propel\Tests\TestCaseFixtures;
 
 /**
- * Test class for PHP5TableMapBuilder.
- *
  * @author François Zaninotto
  */
 class GeneratedRelationMapTest extends TestCaseFixtures

tests/Propel/Tests/Runtime/Map/GeneratedRelationMapWithSchemasTest.php

@@ -15,8 +15,6 @@
 use Propel\Tests\TestCaseFixturesDatabase;
 
 /**
- * Test class for PHP5TableMapBuilder with schemas.
- *
  * @author Ulf Hermann
  *
  * @group database