libretime · jooola · Feb 4, 2014 · Feb 4, 2014 · Feb 13, 2014 · Jul 26, 2014
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -0,0 +1,56 @@
+name: Test
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  test:
+    runs-on: ubuntu-20.04
+    strategy:
+      fail-fast: false
+      matrix:
+        php:
+          - "7.4"
+          - "8.0"
+          - "8.1"
+        composer:
+          - ""
+          - "--prefer-lowest"
+
+    env:
+      DB: mysql
+      DB_USER: root
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Use PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          extensions: sqlite3, zip
+          coverage: xdebug
+          tools: composer
+
+      - run: composer validate
+
+      - run: composer update ${COMPOSER_FLAGS} --prefer-source
+
+      - name: Start MySQL
+        run: |
+          sudo systemctl start mysql
+          mysql_tzinfo_to_sql /usr/share/zoneinfo | mysql -u root -proot mysql
+
+      - name: Disable MySQL strict mode
+        run: |
+          echo "SET GLOBAL sql_mode = ''" | mysql -u root -proot mysql
+
+      - name: setup database
+        run: |
+          sh -c "if [ '$DB' = 'mysql' ]; then mysql -u root -proot mysql -e 'SET FOREIGN_KEY_CHECKS = 0; DROP DATABASE IF EXISTS test; DROP SCHEMA IF EXISTS second_hand_books; DROP SCHEMA IF EXISTS contest; DROP DATABASE IF EXISTS reverse_bookstore; DROP SCHEMA IF EXISTS bookstore_schemas; SET FOREIGN_KEY_CHECKS = 1;'; fi"
+          sh -c "if [ '$DB' = 'mysql' ]; then mysql -u root -proot mysql -e 'CREATE DATABASE test; CREATE SCHEMA bookstore_schemas; CREATE SCHEMA contest; CREATE SCHEMA second_hand_books; CREATE DATABASE reverse_bookstore;'; fi"
+          ./test/reset_tests.sh
+
+      - name: Run Tests
+        run: vendor/bin/phpunit
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -0,0 +1,31 @@
+---
+# See https://pre-commit.com for more information
+# See https://pre-commit.com/hooks.html for more hooks
+repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.4.0
+    hooks:
+      - id: check-added-large-files
+      - id: check-case-conflict
+      - id: check-executables-have-shebangs
+        exclude: generator/bin/propel-gen.bat$
+      - id: check-shebang-scripts-are-executable
+      - id: check-symlinks
+      - id: destroyed-symlinks
+
+      - id: check-json
+      - id: check-yaml
+      - id: check-xml
+        exclude: test/testsuite/runtime/parser/fixtures/test_data.xml$
+
+      - id: check-vcs-permalinks
+      - id: check-merge-conflict
+      - id: end-of-file-fixer
+      - id: mixed-line-ending
+      - id: trailing-whitespace
+
+  - repo: https://github.com/pre-commit/mirrors-prettier
+    rev: v2.7.1
+    hooks:
+      - id: prettier
+        files: \.(md|yml|yaml|json)$
diff --git a/.travis.yml b/.travis.yml
@@ -6,5 +6,4 @@ branches:
 
 services: docker
 
-script:
-  bash docker/run.sh
+script: bash docker/run.sh
diff --git a/CHANGELOG b/CHANGELOG
@@ -6,7 +6,7 @@
 
 SQL injection fix: Coerce offset and limit values to integers
 fix support for php 5.3
-Applying fix for migrate connection error 
+Applying fix for migrate connection error
 Honour value of 'disable_updated_at timestampable behaviour parameter
 Fixed diff generator when several identical columns were renamed
 Support column descriptions in reverse task

diff --git a/README.md b/README.md
@@ -1,26 +1,27 @@
 # Propel #
 
-Propel is an open-source Object-Relational Mapping (ORM) for PHP5.
+Propel is an open-source Object-Relational Mapping (ORM) for PHP.
 
-[![Build Status](https://secure.travis-ci.org/propelorm/Propel.png?branch=master)](http://travis-ci.org/propelorm/Propel)
-[![Total Downloads](https://poser.pugx.org/propel/propel1/downloads.png)](https://packagist.org/packages/propel/propel1)
-[![Latest Stable Version](https://poser.pugx.org/propel/propel1/v/stable.png)](https://packagist.org/packages/propel/propel1)
+This fork is maintained by [Dayspring Partners](https://www.dayspringpartners.com/) and provides compatiblity with PHP 7.4 and 8.x.
 
-## A quick tour of the features ##
+![Build Status](https://github.com/dayspring-tech/Propel/actions/workflows/test.yml/badge.svg)
+[![Total Downloads](https://poser.pugx.org/dayspring-tech/propel1/downloads.png)](https://packagist.org/packages/dayspring-tech/propel1)
+[![Latest Stable Version](https://poser.pugx.org/dayspring-tech/propel1/v/stable.png)](https://packagist.org/packages/dayspring-tech/propel1)
+
+## A quick tour of the features
 
 Propel has some nice features you should know about:
 
- - It's a fast and easy way to manage your database;
- - It provides command line tools for generating code (well documented with an IDE-friendly syntax);
- - It's very flexible: you can simply extend Propel;
- - It uses PDO (PHP Data Objects) so it allows you to use the RDBMS of your choice (MySQL, SQLite, PostgreSQL, Oracle and MSSQL are supported);
- - Propel is an open-source project which is [well documented](http://propelorm.org/Propel/documentation/).
+- It's a fast and easy way to manage your database;
+- It provides command line tools for generating code (well documented with an IDE-friendly syntax);
+- It's very flexible: you can simply extend Propel;
+- It uses PDO (PHP Data Objects) so it allows you to use the RDBMS of your choice (MySQL, SQLite, PostgreSQL, Oracle and MSSQL are supported);
+- Propel is an open-source project which is [well documented](http://propelorm.org/Propel/documentation/).
 
-## Installation ##
+## Installation
 
 Read the [Propel documentation](http://propelorm.org/Propel/).
 
-
-## License ##
+## License
 
 Propel is an open-source project released under the MIT license. See the `LICENSE` file for more information.
diff --git a/composer.json b/composer.json
@@ -1,43 +1,58 @@
 {
-  "name": "propel/propel1",
+  "name": "libretime/propel1",
   "description": "Propel is an open-source Object-Relational Mapping (ORM) for PHP5.",
-  "keywords": ["orm", "active record", "mapping", "database", "persistence"],
+  "keywords": [
+    "orm",
+    "active record",
+    "mapping",
+    "database",
+    "persistence"
+  ],
   "homepage": "http://www.propelorm.org/",
   "license": "MIT",
-  "authors": [{
-    "name": "William Durand",
-    "email": "[email protected]",
-    "homepage": "http://www.willdurand.fr"
-  }],
+  "authors": [
+    {
+      "name": "William Durand",
+      "email": "[email protected]",
+      "homepage": "http://www.willdurand.fr"
+    }
+  ],
   "autoload": {
-      "classmap": ["runtime/lib", "generator/lib"]
+    "classmap": [
+      "runtime/lib",
+      "generator/lib"
+    ]
   },
-  "include-path": ["runtime/lib", "generator/lib"],
+  "include-path": [
+    "runtime/lib",
+    "generator/lib"
+  ],
   "require": {
-    "php": "^7.1",
-    "phing/phing": "~2.4"
-
+    "php": "^7.4 | ^8.0",
+    "phing/phing": "^2.17",
+    "ext-pdo": "*"
   },
   "require-dev": {
-    "pear-pear.php.net/pear_packagefilemanager2": "@stable",
     "phpunit/phpunit": "^9.0.0",
     "phpcompatibility/php-compatibility": "^9.3",
-    "squizlabs/php_codesniffer": "^3.5"
+    "squizlabs/php_codesniffer": "^3.5",
+    "ext-simplexml": "*",
+    "ext-dom": "*"
   },
   "extra": {
     "branch-alias": {
-      "dev-master": "1.7-dev"
+      "dev-main": "1.7-dev"
     }
   },
-  "repositories": [
-    {
-      "type": "pear",
-      "url": "https://pear.php.net"
-    }
+  "replace": {
+    "propel/propel1": "^1.8"
+  },
+  "bin": [
+    "generator/bin/propel-gen",
+    "generator/bin/propel-gen.bat"
   ],
-  "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",
-    "post-update-cmd" : "\"vendor/bin/phpcs\" --config-set installed_paths vendor/phpcompatibility/php-compatibility"
+    "post-install-cmd": "vendor/bin/phpcs --config-set installed_paths vendor/phpcompatibility/php-compatibility",
+    "post-update-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
 
@@ -8,4 +8,3 @@ RUN sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \
 
 USER docker
 ENV LANG en_US.UTF-8
-
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -1,4 +1,4 @@
-version: '3'
+version: "3"
 services:
   php:
     build:
@@ -9,18 +9,17 @@ services:
     volumes:
       - ../:/usr/src/app
     environment:
-      - PHP_EXTENSIONS=intl pdo_sqlite sqlite3
+      - 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
 
   db:
     image: percona
     command: >
-      mysqld
-      --sql-mode="NO_ENGINE_SUBSTITUTION"
-      --character-set-server="utf8"
-      --collation-server="utf8_unicode_ci"
-      --default-authentication-plugin=mysql_native_password
+      mysqld --sql-mode="NO_ENGINE_SUBSTITUTION" --character-set-server="utf8" --collation-server="utf8_unicode_ci" --default-authentication-plugin=mysql_native_password
     restart: always
     environment:
-      MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'
+      MYSQL_ALLOW_EMPTY_PASSWORD: "yes"
diff --git a/docker/reset.sh b/docker/reset.sh
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