Merge remote-tracking branch 'upstream/master' into bugfix/phpstan-lev2

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/Behavior/Validate/templates/objectGetValidationFailures.php

@@ -3,7 +3,7 @@
  * Gets any ConstraintViolation objects that resulted from last call to validate().
  *
  *
- * @return     object ConstraintViolationList
+ * @return     ConstraintViolationList
  * @see        validate()
  */
 public function getValidationFailures()

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.