Skip to content

Commit 81fdf43

Browse files
dereuromarkdereuromark
committed
Cleanup outdated dependencies and min versions.
1 parent e8ef753 commit 81fdf43

12 files changed

+32
-365
lines changed

‎.travis.yml‎

Lines changed: 0 additions & 223 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ git:
88
dist: bionic
99

1010
php:
11-
- 7.1
1211
- 7.2
1312
- 7.3
1413
- 7.4
@@ -40,12 +39,6 @@ script:
4039

4140
jobs:
4241
include:
43-
- php: 7.1
44-
dist: trusty
45-
env: DB=mysql MARIADB=10.1
46-
services:
47-
addons:
48-
mariadb: 10.1
4942
- php: 7.2
5043
dist: trusty
5144
env: DB=mysql MARIADB=10.1
@@ -65,10 +58,6 @@ jobs:
6558
addons:
6659
mariadb: 10.1
6760

68-
- php: 7.1
69-
env: DB=mysql MARIADB=10.2
70-
addons:
71-
mariadb: 10.2
7261
- php: 7.2
7362
env: DB=mysql MARIADB=10.2
7463
addons:
@@ -99,16 +88,6 @@ jobs:
9988
addons:
10089
mariadb: 10.3
10190

102-
- php: 7.1
103-
env: DB=mysql MARIADB=10.4 DB_USER=travis
104-
addons:
105-
mariadb: 10.4
106-
before_script:
107-
- sudo mysql -e 'drop user if exists travis@localhost;'
108-
- sudo mysql -e 'create user travis@localhost;'
109-
- sudo mysql -e "GRANT ALL PRIVILEGES ON db.* TO 'travis'@'localhost'";
110-
- sudo mysql -e "GRANT ALL ON *.* to travis@localhost;";
111-
- ./tests/bin/setup.$DB.sh
11291
- php: 7.2
11392
env: DB=mysql MARIADB=10.4 DB_USER=travis
11493
addons:
@@ -140,10 +119,6 @@ jobs:
140119
- sudo mysql -e "GRANT ALL ON *.* to travis@localhost;";
141120
- ./tests/bin/setup.$DB.sh
142121

143-
- php: 7.1
144-
env: DB=pgsql POSTGRES=9.4
145-
addons:
146-
postgresql: 9.4
147122
- php: 7.2
148123
env: DB=pgsql POSTGRES=9.4
149124
addons:
@@ -157,10 +132,6 @@ jobs:
157132
addons:
158133
postgresql: 9.4
159134

160-
- php: 7.1
161-
env: DB=pgsql POSTGRES=9.5
162-
addons:
163-
postgresql: 9.5
164135
- php: 7.2
165136
env: DB=pgsql POSTGRES=9.5
166137
addons:
@@ -174,10 +145,6 @@ jobs:
174145
addons:
175146
postgresql: 9.5
176147

177-
- php: 7.1
178-
env: DB=pgsql POSTGRES=9.6
179-
addons:
180-
postgresql: 9.6
181148
- php: 7.2
182149
env: DB=pgsql POSTGRES=9.6
183150
addons:
@@ -208,10 +175,6 @@ jobs:
208175
addons:
209176
postgresql: 10
210177

211-
- php: 7.1
212-
env: DB=pgsql POSTGRES=11
213-
addons:
214-
postgresql: 11
215178
- php: 7.2
216179
env: DB=pgsql POSTGRES=11
217180
addons:
@@ -225,22 +188,6 @@ jobs:
225188
addons:
226189
postgresql: 11
227190

228-
- php: 7.1
229-
env: DB=pgsql POSTGRES=12 PGPORT=5432
230-
addons:
231-
postgresql: 12
232-
apt:
233-
packages:
234-
- postgresql-12
235-
- postgresql-client-12
236-
install:
237-
- sudo sed -i 's/md5/trust/g' /etc/postgresql/12/main/pg_hba.conf
238-
- sudo sed -i 's/peer/trust/g' /etc/postgresql/12/main/pg_hba.conf
239-
- sudo sed -i 's/port = 5433/port = 5432/' /etc/postgresql/12/main/postgresql.conf
240-
- sudo pg_ctlcluster --skip-systemctl-redirect 12 main restart
241-
- rm -f ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini
242-
- composer install -v
243-
- composer show
244191
- php: 7.2
245192
env: DB=pgsql POSTGRES=12 PGPORT=5432
246193
addons:
@@ -297,20 +244,6 @@ jobs:
297244
- COMPOSER=./tests/composer/composer-php8.json composer install --ignore-platform-reqs
298245
- composer show
299246

300-
- name: "PHP 7.4, Agnostic, Symfony ~2.7"
301-
php: 7.4
302-
env: DB=agnostic
303-
install:
304-
- rm -f ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini
305-
- COMPOSER=./tests/composer/composer-symfony27-min.json composer install
306-
- composer show
307-
- name: "PHP 7.4, Agnostic, Symfony ^2.7"
308-
php: 7.4
309-
env: DB=agnostic
310-
install:
311-
- rm -f ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini
312-
- COMPOSER=./tests/composer/composer-symfony27-max.json composer install
313-
- composer show
314247
- name: "PHP 7.4, Agnostic, Symfony ~3"
315248
php: 7.4
316249
env: DB=agnostic
@@ -354,20 +287,6 @@ jobs:
354287
- COMPOSER=./tests/composer/composer-symfony5-max.json composer install
355288
- composer show
356289

357-
- name: "PHP 7.4, MySql, Symfony ~2.7"
358-
php: 7.4
359-
env: DB=mysql
360-
install:
361-
- rm -f ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini
362-
- COMPOSER=./tests/composer/composer-symfony27-min.json composer install
363-
- composer show
364-
- name: "PHP 7.4, MySql, Symfony ^2.7"
365-
php: 7.4
366-
env: DB=mysql
367-
install:
368-
- rm -f ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini
369-
- COMPOSER=./tests/composer/composer-symfony27-max.json composer install
370-
- composer show
371290
- name: "PHP 7.4, MySql, Symfony ~3"
372291
php: 7.4
373292
env: DB=mysql
@@ -411,20 +330,6 @@ jobs:
411330
- COMPOSER=./tests/composer/composer-symfony5-max.json composer install
412331
- composer show
413332

414-
- name: "PHP 7.3, Agnostic, Symfony ~2.7"
415-
php: 7.3
416-
env: DB=agnostic
417-
install:
418-
- rm -f ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini
419-
- COMPOSER=./tests/composer/composer-symfony27-min.json composer install
420-
- composer show
421-
- name: "PHP 7.3, Agnostic, Symfony ^2.7"
422-
php: 7.3
423-
env: DB=agnostic
424-
install:
425-
- rm -f ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini
426-
- COMPOSER=./tests/composer/composer-symfony27-max.json composer install
427-
- composer show
428333
- name: "PHP 7.3, Agnostic, Symfony ~3"
429334
php: 7.3
430335
env: DB=agnostic
@@ -468,20 +373,6 @@ jobs:
468373
- COMPOSER=./tests/composer/composer-symfony5-max.json composer install
469374
- composer show
470375

471-
- name: "PHP 7.3, MySql, Symfony ~2.7"
472-
php: 7.3
473-
env: DB=mysql
474-
install:
475-
- rm -f ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini
476-
- COMPOSER=./tests/composer/composer-symfony27-min.json composer install
477-
- composer show
478-
- name: "PHP 7.3, MySql, Symfony ^2.7"
479-
php: 7.3
480-
env: DB=mysql
481-
install:
482-
- rm -f ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini
483-
- COMPOSER=./tests/composer/composer-symfony27-max.json composer install
484-
- composer show
485376
- name: "PHP 7.3, MySql, Symfony ~3"
486377
php: 7.3
487378
env: DB=mysql
@@ -525,20 +416,6 @@ jobs:
525416
- COMPOSER=./tests/composer/composer-symfony5-max.json composer install
526417
- composer show
527418

528-
- name: "PHP 7.2, Agnostic, Symfony ~2.7"
529-
php: 7.2
530-
env: DB=agnostic
531-
install:
532-
- rm -f ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini
533-
- COMPOSER=./tests/composer/composer-symfony27-min.json composer install
534-
- composer show
535-
- name: "PHP 7.2, Agnostic, Symfony ^2.7"
536-
php: 7.2
537-
env: DB=agnostic
538-
install:
539-
- rm -f ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini
540-
- COMPOSER=./tests/composer/composer-symfony27-max.json composer install
541-
- composer show
542419
- name: "PHP 7.2, Agnostic, Symfony ~3"
543420
php: 7.2
544421
env: DB=agnostic
@@ -582,20 +459,6 @@ jobs:
582459
- COMPOSER=./tests/composer/composer-symfony5-max.json composer install
583460
- composer show
584461

585-
- name: "PHP 7.2, MySql, Symfony ~2.7"
586-
php: 7.2
587-
env: DB=mysql
588-
install:
589-
- rm -f ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini
590-
- COMPOSER=./tests/composer/composer-symfony27-min.json composer install
591-
- composer show
592-
- name: "PHP 7.2, MySql, Symfony ^2.7"
593-
php: 7.2
594-
env: DB=mysql
595-
install:
596-
- rm -f ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini
597-
- COMPOSER=./tests/composer/composer-symfony27-max.json composer install
598-
- composer show
599462
- name: "PHP 7.2, MySql, Symfony ~3"
600463
php: 7.2
601464
env: DB=mysql
@@ -639,92 +502,6 @@ jobs:
639502
- COMPOSER=./tests/composer/composer-symfony5-max.json composer install
640503
- composer show
641504

642-
- name: "PHP 7.1, Agnostic, Symfony ~2.7"
643-
php: 7.1
644-
env: DB=agnostic
645-
install:
646-
- rm -f ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini
647-
- COMPOSER=./tests/composer/composer-symfony27-min.json composer install
648-
- composer show
649-
- name: "PHP 7.1, Agnostic, Symfony ^2.7"
650-
php: 7.1
651-
env: DB=agnostic
652-
install:
653-
- rm -f ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini
654-
- COMPOSER=./tests/composer/composer-symfony27-max.json composer install
655-
- composer show
656-
- name: "PHP 7.1, Agnostic, Symfony ~3"
657-
php: 7.1
658-
env: DB=agnostic
659-
install:
660-
- rm -f ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini
661-
- COMPOSER=./tests/composer/composer-symfony3-min.json composer install
662-
- composer show
663-
- name: "PHP 7.1, Agnostic, Symfony ^3"
664-
php: 7.1
665-
env: DB=agnostic
666-
install:
667-
- rm -f ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini
668-
- COMPOSER=./tests/composer/composer-symfony3-max.json composer install
669-
- composer show
670-
- name: "PHP 7.1, Agnostic, Symfony ~4"
671-
php: 7.1
672-
env: DB=agnostic
673-
install:
674-
- rm -f ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini
675-
- COMPOSER=./tests/composer/composer-symfony4-min.json composer install
676-
- composer show
677-
- name: "PHP 7.1, Agnostic, Symfony ^4"
678-
php: 7.1
679-
env: DB=agnostic
680-
install:
681-
- rm -f ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini
682-
- COMPOSER=./tests/composer/composer-symfony4-max.json composer install
683-
- composer show
684-
685-
- name: "PHP 7.1, MySql, Symfony ~2.7"
686-
php: 7.1
687-
env: DB=mysql
688-
install:
689-
- rm -f ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini
690-
- COMPOSER=./tests/composer/composer-symfony27-min.json composer install
691-
- composer show
692-
- name: "PHP 7.1, MySql, Symfony ^2.7"
693-
php: 7.1
694-
env: DB=mysql
695-
install:
696-
- rm -f ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini
697-
- COMPOSER=./tests/composer/composer-symfony27-max.json composer install
698-
- composer show
699-
- name: "PHP 7.1, MySql, Symfony ~3"
700-
php: 7.1
701-
env: DB=mysql
702-
install:
703-
- rm -f ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini
704-
- COMPOSER=./tests/composer/composer-symfony3-min.json composer install
705-
- composer show
706-
- name: "PHP 7.1, MySql, Symfony ^3"
707-
php: 7.1
708-
env: DB=mysql
709-
install:
710-
- rm -f ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini
711-
- COMPOSER=./tests/composer/composer-symfony3-max.json composer install
712-
- composer show
713-
- name: "PHP 7.1, MySql, Symfony ~4"
714-
php: 7.1
715-
env: DB=mysql
716-
install:
717-
- rm -f ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini
718-
- COMPOSER=./tests/composer/composer-symfony4-min.json composer install
719-
- composer show
720-
- name: "PHP 7.1, MySql, Symfony ^4"
721-
php: 7.1
722-
env: DB=mysql
723-
install:
724-
- rm -f ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini
725-
- COMPOSER=./tests/composer/composer-symfony4-max.json composer install
726-
- composer show
727-
728505
- name: Checks
729506
php: 7.4
730507
env: DB=agnostic CHECKS=1

‎README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Propel2
22

3-
Propel2 is an open-source Object-Relational Mapping (ORM) for PHP 7 and up.
3+
Propel2 is an open-source Object-Relational Mapping (ORM) for PHP.
44

55
[![Build Status](https://travis-ci.org/propelorm/Propel2.svg?branch=master)](https://travis-ci.org/propelorm/Propel2)
66
[![Code Climate](https://codeclimate.com/github/propelorm/Propel2/badges/gpa.svg)](https://codeclimate.com/github/propelorm/Propel2)
@@ -21,7 +21,7 @@ Propel2 uses the following Symfony2 Components:
2121
Propel2 also relies on [**Composer**](https://github.com/composer/composer) to manage dependencies but you
2222
also can use [ClassLoader](https://github.com/symfony/ClassLoader) (see the `autoload.php.dist` file for instance).
2323

24-
Propel2 is only supported on PHP 7 and up.
24+
Propel2 is only supported on PHP 7.2 and up.
2525

2626

2727
## Installation
@@ -32,7 +32,7 @@ Read the [Propel documentation](http://propelorm.org/documentation/01-installati
3232
## Contribute
3333

3434
Everybody can contribute to Propel2. Just fork it, and send Pull Requests.
35-
You have to follow [Propel2 Coding Standards](https://github.com/propelorm/Propel2/wiki/Coding-Standards) and provides unit
35+
You have to follow [Propel2 Coding Standards](https://github.com/propelorm/Propel2/wiki/Coding-Standards) and provides unit
3636
tests as much as possible. Also [check out the roadmap](https://github.com/propelorm/Propel2/wiki) to get an overview of what we are working on!
3737

3838
Please see our [contribution guideline](http://propelorm.org/contribute.html). Thank you!

‎composer.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@
1616
}
1717
],
1818
"require": {
19-
"php": ">=7.1",
20-
"symfony/yaml": "^2.7.0||^3.3.0||^4.0.0||^5.0.0",
21-
"symfony/config": "^2.7.0||^3.0.0||^4.0.0||^5.0.0",
22-
"symfony/console": "^2.7.0||^3.0.0||^4.0.0||^5.0.0",
23-
"symfony/filesystem": "^2.7.0||^3.0.0||^4.0.0||^5.0.0",
24-
"symfony/finder": "^2.7.0||^3.0.0||^4.0.0||^5.0.0",
25-
"symfony/translation": "^2.7.0||^3.0.0||^4.0.0||^5.0.0",
26-
"symfony/validator": "^2.7.0||^3.3.0||^4.0.0||^5.0.0",
19+
"php": ">=7.2",
20+
"symfony/yaml": "^3.4.0||^4.3.0||^5.0.0",
21+
"symfony/config": "^3.4.0||^4.3.0||^5.0.0",
22+
"symfony/console": "^3.4.0||^4.3.0||^5.0.0",
23+
"symfony/filesystem": "^3.4.0||^4.3.0||^5.0.0",
24+
"symfony/finder": "^3.4.0||^4.3.0||^5.0.0",
25+
"symfony/translation": "^3.4.0||^4.3.0||^5.0.0",
26+
"symfony/validator": "^3.4.0||^4.3.0||^5.0.0",
2727
"psr/log": "^1.0"
2828
},
2929
"require-dev": {

‎tests/composer/composer-php8.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
}
1919
],
2020
"require": {
21-
"php": ">=7.1",
21+
"php": ">=7.2",
2222
"symfony/yaml": "^5.0.0",
2323
"symfony/config": "^5.0.0",
2424
"symfony/console": "^5.0.0",

0 commit comments

Comments
 (0)