Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

5.4 and up :) #300

Merged
merged 1 commit into from Aug 26, 2012
Merged

5.4 and up :) #300

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 0 additions & 2 deletions .travis.yml
View file
Open in desktop
@@ -1,8 +1,6 @@
language: php language: php


php: php:
- 5.3.3
- 5.3
- 5.4 - 5.4


env: env:
Expand Down
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
@@ -1,6 +1,6 @@
# Propel2 # # Propel2 #


Propel2 is an open-source Object-Relational Mapping (ORM) for PHP 5.3. Propel2 is an open-source Object-Relational Mapping (ORM) for PHP 5.4.


[![Build Status](https://secure.travis-ci.org/propelorm/Propel2.png?branch=master)](http://travis-ci.org/propelorm/Propel2) [![Build Status](https://secure.travis-ci.org/propelorm/Propel2.png?branch=master)](http://travis-ci.org/propelorm/Propel2)


Expand All @@ -18,7 +18,7 @@ Propel2 uses the following Symfony2 Components:
Propel2 also relies on [**Composer**](https://github.com/composer/composer) to manage dependencies but you Propel2 also relies on [**Composer**](https://github.com/composer/composer) to manage dependencies but you
also can use [ClassLoader](https://github.com/symfony/ClassLoader) (see the `autoload.php.dist` file for instance). also can use [ClassLoader](https://github.com/symfony/ClassLoader) (see the `autoload.php.dist` file for instance).


Propel2 is only supported on PHP 5.3.3 and up. Propel2 is only supported on PHP 5.4 and up.




## Installation ## ## Installation ##
Expand Down
4 changes: 2 additions & 2 deletions composer.json
View file
Open in desktop
@@ -1,7 +1,7 @@
{ {
"name": "propel/propel", "name": "propel/propel",
"type": "library", "type": "library",
"description": "Propel2 is an open-source Object-Relational Mapping (ORM) for PHP 5.3", "description": "Propel2 is an open-source Object-Relational Mapping (ORM) for PHP 5.4",
"keywords": [ "keywords": [
"ORM", "ORM",
"persistence", "persistence",
Expand All @@ -16,7 +16,7 @@
} }
], ],
"require": { "require": {
"php": ">=5.3.3", "php": ">=5.4",
"symfony/yaml": "2.1.*", "symfony/yaml": "2.1.*",
"symfony/console": "2.1.*", "symfony/console": "2.1.*",
"monolog/monolog": "1.0.*", "monolog/monolog": "1.0.*",
Expand Down