compatibility with php 7.4 and 8.x (propelorm#4)

* Correct deprecated methods in PHP7.4 (propelorm#1079) * runtime/lib/query/Join.php implode() was used against the definition (wrong PHP documentation * runtime/lib/query/ModelCriteria.php count() was used on non-countable variable (non-array) * 7.4 and phpunit9 changes. Tests are passing * Compatibility changes * Added docker setup * updated travis * added correct path * 7.4 final travis setup * propelorm#1086: Code review suggestions applying * remove dependency on docker mysql * remove 5.6 and 7.2 from test matrix; add 8.0 and 8.1 * Upgraded PHP version and removed some deprecations * Migrated phpunit.xml.dist * Switched to PHP8.0 in Dockerfile * Removed usage of ReflectionClass->getClass in favor of ReflectionClass->getType * Changed order of arguments in ModelCriteriaTest.php and ModelCriteriaWithNamespaceTest.php * Fixed signatures of PropelOnDemandCollection::asort and PropelOnDemandCollection::ksort * Removed require_once from all the classes because we have autoloading via composer * Rector automated upgrade to PHP8 * Fixed invalid handling of resource type for binded value in DebugPDOStatement.php * Fixed invalid way of checking if method exists in delegated class via is_callable. Switched to method_exists * Replaced order of params because of failed tests * [STYLE]: Added simplified usage because of version support dropping * Fix use of abs() with string on PHP8.0 Can happen when using Yaml's multiline syntax * specify minimum version of phing for php8 * drop php 7.3 from test matrix * update to ubuntu-20.04 * fork propel/propel1 for versions >=1.8 Co-authored-by: Michal Drozd <[email protected]> Co-authored-by: Luke Adamczewski <[email protected]> Co-authored-by: Łukasz Adamczewski <[email protected]> Co-authored-by: Jeffrey Wong <[email protected]> Co-authored-by: Luke Adamczewski <[email protected]> Co-authored-by: Paulo Magalhaes <[email protected]>
DanielFortuyn · Feb 10, 2023 · d24a5c2 · d24a5c2
1 parent 678736a
commit d24a5c2
Show file tree

Hide file tree

Showing 149 changed files with 176 additions and 272 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -8,17 +8,14 @@ jobs:
         env:
             DB: mysql
             DB_USER: root
-        runs-on: ubuntu-18.04
+        runs-on: ubuntu-20.04
         strategy:
             fail-fast: false
             matrix:
                 php:
-                    - '5.6'
-                    - '7.2'
-                    - '7.3'
                     - '7.4'
-#                    - '8.0'
-#                    - '8.1'
+                    - '8.0'
+                    - '8.1'
                 composer:
                     - ''
                     - '--prefer-lowest'

diff --git a/composer.json b/composer.json
@@ -1,5 +1,5 @@
 {
-  "name": "propel/propel1",
+  "name": "dayspring-tech/propel1",
   "description": "Propel is an open-source Object-Relational Mapping (ORM) for PHP5.",
   "keywords": ["orm", "active record", "mapping", "database", "persistence"],
   "homepage": "http://www.propelorm.org/",
@@ -14,6 +14,7 @@
   },
   "include-path": ["runtime/lib", "generator/lib"],
   "require": {
+<<<<<<< HEAD
     "php": "^7.1",
     "phing/phing": "~2.4"
 
@@ -23,18 +24,31 @@
     "phpunit/phpunit": "^9.0.0",
     "phpcompatibility/php-compatibility": "^9.3",
     "squizlabs/php_codesniffer": "^3.5"
+=======
+    "php": "^8.0|^7.4",
+    "phing/phing": "^2.17",
+    "ext-pdo": "*"
   },
-  "extra": {
-    "branch-alias": {
-      "dev-master": "1.7-dev"
-    }
+  "require-dev": {
+    "phpunit/phpunit": "^9.0.0",
+    "phpcompatibility/php-compatibility": "^9.3",
+    "squizlabs/php_codesniffer": "^3.5",
+    "ext-simplexml": "*",
+    "ext-dom": "*"
+>>>>>>> 73148f83 (compatibility with php 7.4 and 8.x (#4))
+  },
+  "replace": {
+    "propel/propel1": "^1.8"
   },
+<<<<<<< HEAD
   "repositories": [
     {
       "type": "pear",
       "url": "https://pear.php.net"
     }
   ],
+=======
+>>>>>>> 73148f83 (compatibility with php 7.4 and 8.x (#4))
   "bin": ["generator/bin/propel-gen", "generator/bin/propel-gen.bat"],
   "scripts": {
     "post-install-cmd": "\"vendor/bin/phpcs\" --config-set installed_paths vendor/phpcompatibility/php-compatibility",

diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM thecodingmachine/php:7.4-v3-cli
+FROM thecodingmachine/php:8.0-v4-cli
 USER root
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y locales
 

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -9,9 +9,18 @@ services:
     volumes:
       - ../:/usr/src/app
     environment:
+<<<<<<< HEAD
       - PHP_EXTENSIONS=intl pdo_sqlite sqlite3
       - STARTUP_COMMAND_1=composer install
       - STARTUP_COMMAND_2=bash test/reset_tests.sh
+=======
+      - PHP_EXTENSIONS=intl pdo_sqlite sqlite3 xdebug
+      - STARTUP_COMMAND_1=composer install
+      - STARTUP_COMMAND_2=bash test/reset_tests.sh
+      - PHP_IDE_CONFIG="serverName=propel"
+      - XDEBUG_MODE=debug
+      - XDEBUG_SESSION=1
+>>>>>>> 73148f83 (compatibility with php 7.4 and 8.x (#4))
 
   db:
     image: percona

diff --git a/generator/lib/behavior/DelegateBehavior.php b/generator/lib/behavior/DelegateBehavior.php
@@ -111,7 +111,7 @@ public function objectCall($builder)
                 $relationName = $builder->getFKPhpNameAffix($fk);
             }
             $script .= "
-if (is_callable(array('$ARFQCN', \$name))) {
+if (method_exists('$ARFQCN', \$name)) {
     if (!\$delegate = \$this->get$relationName()) {
         \$delegate = new $ARClassName();
         \$this->set$relationName(\$delegate);

diff --git a/generator/lib/behavior/aggregate_column/AggregateColumnBehavior.php b/generator/lib/behavior/aggregate_column/AggregateColumnBehavior.php
@@ -8,8 +8,6 @@
  * @license    MIT License
  */
 
-require_once 'AggregateColumnRelationBehavior.php';
-
 /**
  * Keeps an aggregate column updated with related table
  *

diff --git a/generator/lib/behavior/aggregate_column/AggregateColumnRelationBehavior.php b/generator/lib/behavior/aggregate_column/AggregateColumnRelationBehavior.php
@@ -8,8 +8,6 @@
  * @license    MIT License
  */
 
-require_once 'AggregateColumnRelationBehavior.php';
-
 /**
  * Keeps an aggregate column updated with related table
  *

diff --git a/generator/lib/behavior/aggregate_column/templates/objectCompute.php b/generator/lib/behavior/aggregate_column/templates/objectCompute.php
@@ -1,4 +1,3 @@
-
 /**
  * Computes the value of the aggregate column <?php echo $column->getName() ?>
  *

diff --git a/generator/lib/behavior/aggregate_column/templates/objectUpdate.php b/generator/lib/behavior/aggregate_column/templates/objectUpdate.php
@@ -1,4 +1,3 @@
-
 /**
  * Updates the aggregate column <?php echo $column->getName() ?>
  *

diff --git a/generator/lib/behavior/aggregate_column/templates/objectUpdateRelated.php b/generator/lib/behavior/aggregate_column/templates/objectUpdateRelated.php
@@ -1,4 +1,3 @@
-
 /**
  * Update the aggregate column in the related <?php echo $relationName ?> object
  *

diff --git a/generator/lib/behavior/aggregate_column/templates/queryFindRelated.php b/generator/lib/behavior/aggregate_column/templates/queryFindRelated.php
@@ -1,4 +1,3 @@
-
 /**
  * Finds the related <?php echo $foreignTable->getPhpName() ?> objects and keep them for later
  *

diff --git a/generator/lib/behavior/aggregate_column/templates/queryUpdateRelated.php b/generator/lib/behavior/aggregate_column/templates/queryUpdateRelated.php
@@ -1,4 +1,3 @@
-
 protected function updateRelated<?php echo $relationName ?>s($con)
 {
     foreach ($this-><?php echo $variableName ?>s as $<?php echo $variableName ?>) {

diff --git a/generator/lib/behavior/archivable/ArchivableBehavior.php b/generator/lib/behavior/archivable/ArchivableBehavior.php
@@ -8,8 +8,7 @@
  * @license    MIT License
  */
 
-require_once dirname(__FILE__) . '/ArchivableBehaviorObjectBuilderModifier.php';
-require_once dirname(__FILE__) . '/ArchivableBehaviorQueryBuilderModifier.php';
+
 
 /**
  * Keeps tracks of an ActiveRecord object, even after deletion

diff --git a/generator/lib/behavior/archivable/templates/objectDeleteWithoutArchive.php b/generator/lib/behavior/archivable/templates/objectDeleteWithoutArchive.php
@@ -1,4 +1,3 @@
-
 /**
  * Removes the object from the database without archiving it.
  *

diff --git a/generator/lib/behavior/archivable/templates/objectGetArchive.php b/generator/lib/behavior/archivable/templates/objectGetArchive.php
@@ -1,4 +1,3 @@
-
 /**
  * Get an archived version of the current object.
  *

diff --git a/generator/lib/behavior/archivable/templates/objectPopulateFromArchive.php b/generator/lib/behavior/archivable/templates/objectPopulateFromArchive.php
@@ -1,4 +1,3 @@
-
 /**
  * Populates the the current object based on a $archiveTablePhpName archive object.
  *

diff --git a/generator/lib/behavior/archivable/templates/objectRestoreFromArchive.php b/generator/lib/behavior/archivable/templates/objectRestoreFromArchive.php
@@ -1,4 +1,3 @@
-
 /**
  * Revert the the current object to the state it had when it was last archived.
  * The object must be saved afterwards if the changes must persist.

diff --git a/generator/lib/behavior/archivable/templates/objectSaveWithoutArchive.php b/generator/lib/behavior/archivable/templates/objectSaveWithoutArchive.php
@@ -1,4 +1,3 @@
-
 /**
  * Persists the object to the database without archiving it.
  *

diff --git a/generator/lib/behavior/archivable/templates/queryArchive.php b/generator/lib/behavior/archivable/templates/queryArchive.php
@@ -1,4 +1,3 @@
-
 /**
  * Copy the data of the objects satisfying the query into <?php echo $archiveTablePhpName ?> archive objects.
  * The archived objects are then saved.

diff --git a/generator/lib/behavior/archivable/templates/queryDeleteWithoutArchive.php b/generator/lib/behavior/archivable/templates/queryDeleteWithoutArchive.php
@@ -1,4 +1,3 @@
-
 /**
  * Delete records matching the current query without archiving them.
  *

diff --git a/generator/lib/behavior/archivable/templates/querySetArchiveOnDelete.php b/generator/lib/behavior/archivable/templates/querySetArchiveOnDelete.php
@@ -1,4 +1,3 @@
-
 /**
  * Enable/disable auto-archiving on delete for the next query.
  *

diff --git a/generator/lib/behavior/archivable/templates/querySetArchiveOnUpdate.php b/generator/lib/behavior/archivable/templates/querySetArchiveOnUpdate.php
@@ -1,4 +1,3 @@
-
 /**
  * Enable/disable auto-archiving on update for the next query.
  *

diff --git a/generator/lib/behavior/archivable/templates/queryUpdateWithoutArchive.php b/generator/lib/behavior/archivable/templates/queryUpdateWithoutArchive.php
@@ -1,4 +1,3 @@
-
 /**
  * Delete records matching the current query without archiving them.
  *

diff --git a/generator/lib/behavior/concrete_inheritance/ConcreteInheritanceBehavior.php b/generator/lib/behavior/concrete_inheritance/ConcreteInheritanceBehavior.php
@@ -8,7 +8,6 @@
  * @license    MIT License
  */
 
-require_once 'ConcreteInheritanceParentBehavior.php';
 
 /**
  * Makes a model inherit another one. The model with this behavior gets a copy

diff --git a/generator/lib/behavior/i18n/I18nBehavior.php b/generator/lib/behavior/i18n/I18nBehavior.php
@@ -8,9 +8,8 @@
  * @license    MIT License
  */
 
-require_once dirname(__FILE__) . '/I18nBehaviorObjectBuilderModifier.php';
-require_once dirname(__FILE__) . '/I18nBehaviorQueryBuilderModifier.php';
-require_once dirname(__FILE__) . '/I18nBehaviorPeerBuilderModifier.php';
+
+
 
 /**
  * Allows translation of text columns through transparent one-to-many relationship

diff --git a/generator/lib/behavior/i18n/templates/objectAttributes.php b/generator/lib/behavior/i18n/templates/objectAttributes.php
@@ -1,4 +1,3 @@
-
 /**
  * Current locale
  * @var        string

diff --git a/generator/lib/behavior/i18n/templates/objectGetCurrentTranslation.php b/generator/lib/behavior/i18n/templates/objectGetCurrentTranslation.php
@@ -1,4 +1,3 @@
-
 /**
  * Returns the current translation
  *

diff --git a/generator/lib/behavior/i18n/templates/objectGetLocale.php b/generator/lib/behavior/i18n/templates/objectGetLocale.php
@@ -1,4 +1,3 @@
-
 /**
  * Gets the locale for translations
  *

diff --git a/generator/lib/behavior/i18n/templates/objectGetLocaleAlias.php b/generator/lib/behavior/i18n/templates/objectGetLocaleAlias.php
@@ -1,4 +1,3 @@
-
 /**
  * Gets the locale for translations.
  * Alias for getLocale(), for BC purpose.

diff --git a/generator/lib/behavior/i18n/templates/objectGetTranslation.php b/generator/lib/behavior/i18n/templates/objectGetTranslation.php
@@ -1,4 +1,3 @@
-
 /**
  * Returns the current translation for a given locale
  *

diff --git a/generator/lib/behavior/i18n/templates/objectPostDelete.php b/generator/lib/behavior/i18n/templates/objectPostDelete.php
@@ -1,4 +1,3 @@
-
 // emulate delete cascade
 <?php echo $i18nQueryName ?>::create()
     ->filterBy<?php echo $objectClassname ?>($this)

diff --git a/generator/lib/behavior/i18n/templates/objectRemoveTranslation.php b/generator/lib/behavior/i18n/templates/objectRemoveTranslation.php
@@ -1,4 +1,3 @@
-
 /**
  * Remove the translation for a given locale
  *

diff --git a/generator/lib/behavior/i18n/templates/objectSetLocale.php b/generator/lib/behavior/i18n/templates/objectSetLocale.php
@@ -1,4 +1,3 @@
-
 /**
  * Sets the locale for translations
  *

diff --git a/generator/lib/behavior/i18n/templates/objectSetLocaleAlias.php b/generator/lib/behavior/i18n/templates/objectSetLocaleAlias.php
@@ -1,4 +1,3 @@
-
 /**
  * Sets the locale for translations.
  * Alias for setLocale(), for BC purpose.

diff --git a/generator/lib/behavior/i18n/templates/objectSetTranslation.php b/generator/lib/behavior/i18n/templates/objectSetTranslation.php
@@ -1,4 +1,3 @@
-
 /**
  * Sets the translation for a given locale
  *

diff --git a/generator/lib/behavior/i18n/templates/objectTranslatedColumnGetter.php b/generator/lib/behavior/i18n/templates/objectTranslatedColumnGetter.php
@@ -1,4 +1,3 @@
-
 <?php echo $comment ?>
 <?php echo $functionStatement ?>
 

diff --git a/generator/lib/behavior/i18n/templates/objectTranslatedColumnSetter.php b/generator/lib/behavior/i18n/templates/objectTranslatedColumnSetter.php
@@ -1,4 +1,3 @@
-
 <?php echo $comment ?>
 <?php echo $functionStatement ?>
     $this->getCurrentTranslation()->set<?php echo $columnPhpName ?>(<?php echo $params ?>);

diff --git a/generator/lib/behavior/i18n/templates/queryJoinI18n.php b/generator/lib/behavior/i18n/templates/queryJoinI18n.php
@@ -1,4 +1,3 @@
-
 /**
  * Adds a JOIN clause to the query using the i18n relation
  *

diff --git a/generator/lib/behavior/i18n/templates/queryJoinWithI18n.php b/generator/lib/behavior/i18n/templates/queryJoinWithI18n.php
@@ -1,4 +1,3 @@
-
 /**
  * Adds a JOIN clause to the query and hydrates the related I18n object.
  * Shortcut for $c->joinI18n($locale)->with()

diff --git a/generator/lib/behavior/i18n/templates/queryUseI18nQuery.php b/generator/lib/behavior/i18n/templates/queryUseI18nQuery.php
@@ -1,4 +1,3 @@
-
 /**
  * Use the I18n relation query object
  *

diff --git a/generator/lib/behavior/nestedset/NestedSetBehavior.php b/generator/lib/behavior/nestedset/NestedSetBehavior.php
@@ -8,9 +8,8 @@
  * @license    MIT License
  */
 
-require_once dirname(__FILE__) . '/NestedSetBehaviorObjectBuilderModifier.php';
-require_once dirname(__FILE__) . '/NestedSetBehaviorQueryBuilderModifier.php';
-require_once dirname(__FILE__) . '/NestedSetBehaviorPeerBuilderModifier.php';
+
+
 
 /**
  * Behavior to adds nested set tree structure columns and abilities

diff --git a/generator/lib/behavior/sortable/SortableBehavior.php b/generator/lib/behavior/sortable/SortableBehavior.php
@@ -8,10 +8,9 @@
  * @license    MIT License
  */
 
-require_once dirname(__FILE__) . '/SortableBehaviorObjectBuilderModifier.php';
-require_once dirname(__FILE__) . '/SortableBehaviorQueryBuilderModifier.php';
-require_once dirname(__FILE__) . '/SortableBehaviorPeerBuilderModifier.php';
-require_once dirname(__FILE__) . '/SortableRelationBehavior.php';
+
+
+
 
 /**
  * Gives a model class the ability to be ordered

diff --git a/generator/lib/behavior/versionable/VersionableBehavior.php b/generator/lib/behavior/versionable/VersionableBehavior.php
@@ -8,9 +8,8 @@
  * @license    MIT License
  */
 
-require_once dirname(__FILE__) . '/VersionableBehaviorObjectBuilderModifier.php';
-require_once dirname(__FILE__) . '/VersionableBehaviorQueryBuilderModifier.php';
-require_once dirname(__FILE__) . '/VersionableBehaviorPeerBuilderModifier.php';
+
+
 
 /**
  * Keeps tracks of all the modifications in an ActiveRecord object

diff --git a/generator/lib/builder/om/ExtensionQueryBuilder.php b/generator/lib/builder/om/ExtensionQueryBuilder.php
@@ -8,7 +8,6 @@
  * @license    MIT License
  */
 
-require_once dirname(__FILE__) . '/OMBuilder.php';
 
 /**
  * Generates the empty PHP5 stub class for object query

diff --git a/generator/lib/builder/om/ExtensionQueryInheritanceBuilder.php b/generator/lib/builder/om/ExtensionQueryInheritanceBuilder.php
@@ -8,7 +8,6 @@
  * @license    MIT License
  */
 
-require_once dirname(__FILE__) . '/OMBuilder.php';
 
 /**
  * Generates the empty PHP5 stub query class for use with single table inheritance.

diff --git a/generator/lib/builder/om/OMBuilder.php b/generator/lib/builder/om/OMBuilder.php
@@ -8,7 +8,6 @@
  * @license    MIT License
  */
 
-require_once dirname(__FILE__) . '/../DataModelBuilder.php';
 
 /**
  * Baseclass for OM-building classes.

diff --git a/generator/lib/builder/om/ObjectBuilder.php b/generator/lib/builder/om/ObjectBuilder.php
@@ -8,7 +8,6 @@
  * @license    MIT License
  */
 
-require_once dirname(__FILE__) . '/OMBuilder.php';
 
 /**
  * Base class for Peer-building classes.

diff --git a/generator/lib/builder/om/PHP5ExtensionNodeBuilder.php b/generator/lib/builder/om/PHP5ExtensionNodeBuilder.php
@@ -8,7 +8,6 @@
  * @license    MIT License
  */
 
-require_once dirname(__FILE__) . '/ObjectBuilder.php';
 
 /**
  * Generates the empty PHP5 stub node object class for user object model (OM).

diff --git a/generator/lib/builder/om/PHP5ExtensionNodePeerBuilder.php b/generator/lib/builder/om/PHP5ExtensionNodePeerBuilder.php
@@ -8,7 +8,6 @@
  * @license    MIT License
  */
 
-require_once dirname(__FILE__) . '/PeerBuilder.php';
 
 /**
  * Generates the empty PHP5 stub node peer class for user object model (OM).

diff --git a/generator/lib/builder/om/PHP5ExtensionObjectBuilder.php b/generator/lib/builder/om/PHP5ExtensionObjectBuilder.php
@@ -8,7 +8,6 @@
  * @license    MIT License
  */
 
-require_once dirname(__FILE__) . '/ObjectBuilder.php';
 
 /**
  * Generates the empty PHP5 stub object class for user object model (OM).