Skip to content
This repository
Browse code

Merge pull request #300 from harikt/php54

5.4 and up :)
  • Loading branch information...
commit c8dcbc9b2874ff558dab87ac1564152d0eb94271 2 parents 99e125e + 7482ca3
William Durand willdurand authored

Showing 3 changed files with 4 additions and 6 deletions. Show diff stats Hide diff stats

  1. +0 2  .travis.yml
  2. +2 2 README.md
  3. +2 2 composer.json
2  .travis.yml
... ... @@ -1,8 +1,6 @@
1 1 language: php
2 2
3 3 php:
4   - - 5.3.3
5   - - 5.3
6 4 - 5.4
7 5
8 6 env:
4 README.md
Source Rendered
... ... @@ -1,6 +1,6 @@
1 1 # Propel2 #
2 2
3   -Propel2 is an open-source Object-Relational Mapping (ORM) for PHP 5.3.
  3 +Propel2 is an open-source Object-Relational Mapping (ORM) for PHP 5.4.
4 4
5 5 [![Build Status](https://secure.travis-ci.org/propelorm/Propel2.png?branch=master)](http://travis-ci.org/propelorm/Propel2)
6 6
@@ -18,7 +18,7 @@ Propel2 uses the following Symfony2 Components:
18 18 Propel2 also relies on [**Composer**](https://github.com/composer/composer) to manage dependencies but you
19 19 also can use [ClassLoader](https://github.com/symfony/ClassLoader) (see the `autoload.php.dist` file for instance).
20 20
21   -Propel2 is only supported on PHP 5.3.3 and up.
  21 +Propel2 is only supported on PHP 5.4 and up.
22 22
23 23
24 24 ## Installation ##
4 composer.json
... ... @@ -1,7 +1,7 @@
1 1 {
2 2 "name": "propel/propel",
3 3 "type": "library",
4   - "description": "Propel2 is an open-source Object-Relational Mapping (ORM) for PHP 5.3",
  4 + "description": "Propel2 is an open-source Object-Relational Mapping (ORM) for PHP 5.4",
5 5 "keywords": [
6 6 "ORM",
7 7 "persistence",
@@ -16,7 +16,7 @@
16 16 }
17 17 ],
18 18 "require": {
19   - "php": ">=5.3.3",
  19 + "php": ">=5.4",
20 20 "symfony/yaml": "2.1.*",
21 21 "symfony/console": "2.1.*",
22 22 "monolog/monolog": "1.0.*",

0 comments on commit c8dcbc9

Please sign in to comment.
Something went wrong with that request. Please try again.