Skip to content
This repository was archived by the owner on Apr 30, 2025. It is now read-only.
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
9d7e243
Fix tests to be able to finish it without a fatal error
alquerci Sep 8, 2018
e81dcd3
Fix tests for relationship fetch order when the order is not explicit…
alquerci Sep 1, 2019
c6baf4d
Fix PHP 7 compatibility about deep isset() on class that implement Ar…
alquerci Sep 1, 2019
b55cdc4
Mark as known bug, integer validation with numbers greater than PHP_I…
alquerci Sep 1, 2019
b2a97cc
Fix test for export to XML
alquerci Sep 1, 2019
6b38c1f
Fix PHP 7.4 compatibility
alquerci Sep 1, 2019
adbf2a9
Add zlib required PHP extension on composer configuration
alquerci Sep 1, 2019
da740ae
Fix code structure about always close connections after each test
alquerci Jul 25, 2022
ae10c17
Merge pull request #56 from alquerci/fix-tests-to-be-able-to-finish-i…
thePanz Oct 5, 2022
cf59be0
Add consistent local environment for testing with docker and docker-c…
alquerci Oct 5, 2022
8926c13
Update Builder.php for PHP8 compatibility (#82)
xNatek Oct 5, 2022
27943d7
PHP 8.0 > Typing of internal function parameters do not allow null va…
Tybaze Jun 9, 2022
50cb69e
PHP 8.1 > Compatibility
Tybaze Jun 9, 2022
b6546b1
PR Review - Small bug Fixes
Tybaze Aug 2, 2022
9c63e5d
Fix Annotation and Coding Style
Tybaze Jul 10, 2022
f8ea8b7
Add proof tast name with empty task name property sets by child class
alquerci Oct 5, 2022
9759c58
Use GitHub actions for Continuous Integration tests
thePanz Nov 24, 2022
ced44c8
Fix broken tests when not using shared mysql socket within docker con…
thePanz Nov 24, 2022
92abb24
Remove deprecated --no-suggest option from composer
thePanz Nov 24, 2022
1733100
Update GitHub actions: run pipeline for PRs too
thePanz Jan 9, 2023
f1ac6a0
PHP 8.1 > a few more ReturnTypeWillChange attributes added
thirsch Dec 15, 2022
287270b
Flushing more than once causes a warning. Resetting $_collections to …
thirsch Dec 15, 2022
6ff2997
Added type hint for arrays as the second parameter allows both, a str…
thirsch Dec 15, 2022
816ad13
PHP 8.2 > Creation of dynamic property Class::$property is deprecated
thirsch Dec 15, 2022
a572748
PHP 8.2 > Using ${var} in strings is deprecated, use {$var} instead.
thirsch Dec 15, 2022
72a9ff9
PHP 8.0 > Trying to access array offset on value of type bool
thirsch Dec 15, 2022
33bca65
PHP 8.2 > added test environment
thirsch Dec 15, 2022
0241c0b
PHP 8.2 > Removed properties from Doctrine_RawSql and used _preQuerie…
thirsch Jan 9, 2023
0ee6863
Merge pull request #91 from vemaeg/feature/php-8.2-changes
thePanz Jan 10, 2023
81c839b
add double to type check. bug #88
connorhu Jan 10, 2023
b4749b5
Merge pull request #94 from connorhu/fix-88
thePanz Jan 10, 2023
4625750
PHP 8.1 > Deprecated: strtolower(): Passing null to parameter #1 ($st…
thirsch Feb 11, 2023
8d045bd
Update(github) Update github workflows, use composer caches
thePanz Nov 17, 2023
0978095
Fix array key access in lib/Doctrine/Import/Builder.php
paddyhamburg Jun 27, 2023
9b426e6
CI: add PHP v8.3 to the CI pipelines (#108)
thePanz Jan 17, 2024
46791a3
Remove PHP Pear configurations
thePanz Jan 17, 2024
5ec53b7
Update GitAttributes file
thePanz Jan 17, 2024
0df2b8b
Fix PHP deprecations on ArrayAccess and additional classes
thePanz Jan 17, 2024
2373ce3
fix(Query): add failed test for column added twice with custom aliases
alquerci Jan 20, 2024
29961c7
Revert "Added fields with alias to pendingFields array, fixed DC-585"
alquerci Jan 20, 2024
1d68711
Fix(Query): column added twice with custom aliases
alquerci Jan 20, 2024
4f020ae
Fixed test 1325TestCase.php
thirsch Jan 29, 2024
cc51a4f
fix(tests) replace use of iconv in SearchTestCase.php
connorhu Jan 24, 2024
7327db8
add(composer): ext-iconv is now a requirement
connorhu Jan 24, 2024
eeb1777
Adding columns defined in actAs-templates to the docblock of the gene…
thirsch Dec 15, 2022
9e0ac04
Update readme: we dont have 1.5 here
connorhu Feb 5, 2024
3679947
Update min PHP version to v7.4 (#122)
connorhu Feb 6, 2024
1990ab3
Fix invalid docblock for Collection::fromArray()
miamibc Feb 9, 2024
ff63f6c
Remove unused variable from Collection::fromArray()
miamibc Feb 9, 2024
b756c43
[composer] add sort-packages
connorhu Feb 6, 2024
b2e59a6
introduce __DIR__ constants
connorhu Feb 17, 2024
f7a6e29
PHP 8.1 > ReturnTypeWillChange attributes added
thirsch Feb 3, 2024
931eef1
fixed CI tasks on relevant folders
connorhu Feb 22, 2024
a552724
Fix Doctrine lengthValidator deprecation on null float/decimal values…
iricketson Apr 29, 2024
5ef8287
Fix code style, remove extra whitespaces
thePanz Jun 14, 2024
f47a790
Tests: ensure models contain only one record per file
thePanz Jun 26, 2024
773e8ba
Fix return type
iricketson Jul 3, 2024
e7bbbb0
Add(typehint) Add typehint to methods and return types
thePanz Jun 27, 2024
5c857c2
Add(typehint): Add typehint to methods and void return to Doctrine_Qu…
thePanz Oct 11, 2024
5ffcb73
Fix(typehint) Fix PHP deprecations on Doctrine_Record_Filter::filterS…
thePanz Oct 25, 2024
1fcab9a
Added php 8.4 to ci pipeline
thirsch Dec 23, 2024
bbd1cdd
PHP 8.4 > Implicitly marking parameter as nullable is deprecated
thirsch Dec 23, 2024
a42931c
[heads/upstream] Merge remote-tracking branch 'upstream/master' into …
wutsch0 Apr 28, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 48 additions & 0 deletions .docker/php53/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
FROM buildpack-deps:jessie

ENV PHP_VERSION 5.3.29

# php 5.3 needs older autoconf
RUN set -eux; \
\
apt-get update; \
apt-get install -y \
curl \
autoconf2.13 \
; \
rm -r /var/lib/apt/lists/*; \
\
curl -sSLfO http://launchpadlibrarian.net/140087283/libbison-dev_2.7.1.dfsg-1_amd64.deb; \
curl -sSLfO http://launchpadlibrarian.net/140087282/bison_2.7.1.dfsg-1_amd64.deb; \
dpkg -i libbison-dev_2.7.1.dfsg-1_amd64.deb; \
dpkg -i bison_2.7.1.dfsg-1_amd64.deb; \
rm *.deb; \
\
curl -sSLf "https://php.net/get/php-$PHP_VERSION.tar.bz2/from/this/mirror" -o php.tar.bz2; \
echo 'c4e1cf6972b2a9c7f2777a18497d83bf713cdbecabb65d3ff62ba441aebb0091 php.tar.bz2' | sha256sum -cw --status; \
\
mkdir -p /usr/src/php; \
tar -xf php.tar.bz2 -C /usr/src/php --strip-components=1; \
rm php.tar.bz2*; \
\
cd /usr/src/php; \
./buildconf --force; \
./configure --disable-cgi \
$(command -v apxs2 > /dev/null 2>&1 && echo '--with-apxs2' || true) \
--with-pdo-mysql \
--with-zlib \
--enable-mbstring \
; \
make -j"$(nproc)"; \
make install; \
\
dpkg -r \
bison \
libbison-dev \
; \
apt-get purge -y --auto-remove \
autoconf2.13 \
; \
rm -r /usr/src/php

CMD ["php", "-a"]
5 changes: 5 additions & 0 deletions .docker/php54/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
FROM php:5.4-cli

RUN docker-php-ext-install pdo
RUN docker-php-ext-install pdo_mysql
RUN docker-php-ext-install mbstring
6 changes: 6 additions & 0 deletions .docker/php55_71/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
ARG PHP_TAG
FROM php:${PHP_TAG}

RUN docker-php-ext-install pdo
RUN docker-php-ext-install pdo_mysql
RUN docker-php-ext-install mbstring
22 changes: 22 additions & 0 deletions .docker/php72_73/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
ARG PHP_VERSION
FROM php:${PHP_VERSION}-cli

RUN docker-php-ext-install pdo
RUN docker-php-ext-install pdo_mysql
RUN docker-php-ext-install mbstring

# For consistent mime type file guesser
RUN set -eux; \
distFilePath=`which file`; \
\
mv ${distFilePath} ${distFilePath}.dist; \
{ \
echo '#! /bin/sh -eu'; \
echo ''; \
echo "${distFilePath}"'.dist "$@" | sed -e s,application/x-pie-executable,application/x-executable,g'; \
} | tee ${distFilePath}; \
\
chmod +x ${distFilePath}; \
\
file /bin/ls --mime | grep application/x-executable; \
:;
34 changes: 34 additions & 0 deletions .docker/php74_82/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
ARG PHP_VERSION
FROM php:${PHP_VERSION}-cli

RUN docker-php-ext-install pdo
RUN docker-php-ext-install pdo_mysql

# Install mbstring PHP extension
#
RUN set -eux; \
apt-get update; \
apt-get install -y --no-upgrade --no-install-recommends \
libonig-dev \
; \
\
apt-get clean; \
rm -rf /var/lib/apt/lists/*; \
\
docker-php-ext-install mbstring

# For consistent mime type file guesser
RUN set -eux; \
distFilePath=`which file`; \
\
mv ${distFilePath} ${distFilePath}.dist; \
{ \
echo '#! /bin/sh -eu'; \
echo ''; \
echo "${distFilePath}"'.dist "$@" | sed -e s,application/x-pie-executable,application/x-executable,g'; \
} | tee ${distFilePath}; \
\
chmod +x ${distFilePath}; \
\
file /bin/ls --mime | grep application/x-executable; \
:;
7 changes: 4 additions & 3 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
/.docker export-ignore
/.gitattributes export-ignore
/.gitignore export-ignore
/.travis.yml export-ignore
/build.properties.dev export-ignore
/build.xml export-ignore
/.github export-ignore

/docker-compose.yml
/tests export-ignore
/tools export-ignore
66 changes: 66 additions & 0 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
name: "Continuous Integration"

on:
pull_request:
branches:
- master
paths:
- .github/workflows/continuous-integration.yml
- composer.*
- lib/**
- tests/**

push:
branches:
- master
paths:
- .github/workflows/continuous-integration.yml
- composer.*
- lib/**
- tests/**

env:
fail-fast: true

jobs:
tests:
name: "Doctrine1 Tests"
runs-on: "ubuntu-latest"

strategy:
matrix:
php-version:
- "7.4"
- "8.0"
- "8.1"
- "8.2"
- "8.3"
- "8.4"

steps:
- name: Checkout
uses: actions/checkout@v3
with:
submodules: "true"

- name: Install PHP
uses: shivammathur/setup-php@v2
with:
php-version: "${{ matrix.php-version }}"

- name: Get composer cache directory
id: composer-cache
run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT

- name: Cache dependencies
uses: actions/cache@v3
with:
path: ${{ steps.composer-cache.outputs.dir }}
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
restore-keys: ${{ runner.os }}-composer-

- name: Install dependencies
run: composer install --prefer-dist

- name: Run Tests
run: cd tests && php run.php
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,6 @@
tests/DoctrineTest/doctrine_tests/*
*TestCase.php
*TestCase.php
/composer.lock
/tests/tmp
/tests/foo.sq3
/vendor/
35 changes: 0 additions & 35 deletions .travis.yml

This file was deleted.

54 changes: 54 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
Doctrine1
=========

About this version
------------------

This is a community driven fork of doctrine 1, as official support has been interrupted long time ago.

**Do not use it for new projects: this version is great to improve existing symfony1 applications using doctrine1, but [Doctrine2](https://www.doctrine-project.org/projects/orm.html) is the way to go today.**


Requirements
------------

PHP 5.3 and up.


Installation
------------

Using [Composer](http://getcomposer.org/doc/00-intro.md) as dependency management:

composer require friendsofsymfony1/doctrine1 "1.4.*"
composer install



Tests
-----

### Prerequisites

* docker-engine version 17.12.0+
* docker-compose version 1.20.0+

### How to execute all tests on all supported PHP versions and dependencies?

tests/bin/test

### When you finish your work day, do not forget to clean up your desk

docker-compose down


Documentation
-------------

Read the official [doctrine1 documentation](https://web.archive.org/web/20171008235327/http://docs.doctrine-project.org:80/projects/doctrine1/en/latest/en/manual/index.html)


Contributing
------------

You can send pull requests or create an issue.
11 changes: 0 additions & 11 deletions build.properties.dev

This file was deleted.

Loading