Skip to content

Commit 8235b9e

Browse files
committed
upgrade dependencies & README
1 parent b149fdb commit 8235b9e

File tree

4 files changed

+19
-1336
lines changed

4 files changed

+19
-1336
lines changed

README.md

+4-37
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,11 @@
11
# GitElephantBundle #
22

3-
This is a simple bundle to use the [GitElephant library](https://github.com/matteosister/GitElephant) in a Symfony2 project
4-
5-
Watch a [simple live example](http://gitelephant.cypresslab.net/GitElephant) of what you can do with [GitElephant](https://github.com/matteosister/GitElephant), GitElephantBundle, Symfony2 and a git repository...
6-
7-
[Download the demo bundle code](https://github.com/matteosister/GitElephantDemoBundle) used in the live example
8-
9-
![GitElephantBundle wdt](https://github.com/matteosister/GitElephantBundle/raw/master/preview.png)
10-
3+
This is a simple bundle to use the [GitElephant library](https://github.com/matteosister/GitElephant) in a Symfony project.
114

125
How to install
136
--------------
147

15-
**Method 1 - deps file (for Symfony 2.0)**
16-
17-
- Add the GitElephant library and the bundle itself in the deps file
18-
19-
*deps*
20-
21-
[GitElephant]
22-
git=git://github.com/matteosister/GitElephant.git
23-
target=git-elephant
24-
25-
[GitElephantBundle]
26-
git=git://github.com/matteosister/GitElephantBundle.git
27-
target=/bundles/Cypress/GitElephantBundle
28-
29-
- Register the two namespaces in the autoload.php file
30-
31-
*app/autoload.php*
32-
33-
``` php
34-
$loader->registerNamespaces(array(
35-
// ...other namespaces
36-
'GitElephant' => __DIR__.'/../vendor/git-elephant/src',
37-
'Cypress' => __DIR__.'/../vendor/bundles',
38-
));
39-
```
40-
41-
**Method 2 - composer for Symfony 2.1 and above (recommended)**
8+
**Method 1 - composer for Symfony 2.1 and above (recommended)**
429

4310
- Add the following line to the `composer.json` file:
4411

@@ -96,7 +63,7 @@ class AppKernel extends Kernel
9663
}
9764
```
9865

99-
**Method 3 - submodules**
66+
**Method 2 - submodules**
10067

10168
You can also manage the two git repositories with git and submodules. It could be a mess if you don't know what you do, but I personally prefer this way
10269

@@ -220,4 +187,4 @@ $ php app/console cypress:git:hit [--no-push] [--fast-forward] [--all] tag [comm
220187
Example
221188
-------
222189

223-
There is also a [demo bundle](https://github.com/matteosister/GitElephantDemoBundle) to see it in action
190+
There is also a [demo bundle](https://github.com/matteosister/GitElephantDemoBundle) to see it in action.

Resources/config/services.xml

+1-7
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,10 @@
1212
</parameters>
1313

1414
<services>
15-
<service id="cypress_git_elephant.git_binary"
16-
class="%cypress_git_elephant.binary.class%"
17-
public="true">
18-
<argument>%cypress_git_elephant.binary_path%</argument>
19-
</service>
20-
2115
<service id="cypress_git_elephant.repository_collection"
2216
class="%cypress_git_elephant.repository_collection.class%">
2317
<argument>%cypress_git_elephant.repositories%</argument>
24-
<argument type="service" id="cypress_git_elephant.git_binary" />
18+
<argument>%cypress_git_elephant.binary_path%</argument>
2519
</service>
2620
<service id="git_repositories" alias="cypress_git_elephant.repository_collection" />
2721

composer.json

+14-10
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22
"name": "cypresslab/gitelephant-bundle",
33
"type": "symfony-bundle",
44
"description": "GitElephant bundle for Symfony2",
5-
"keywords": ["git"],
5+
"keywords": [
6+
"git"
7+
],
68
"homepage": "https://github.com/matteosister/GitElephant",
79
"license": "LGPL-3.0+",
810
"authors": [
@@ -12,17 +14,19 @@
1214
}
1315
],
1416
"require": {
15-
"php": ">=5.3.2",
16-
"symfony/config": "~2.3",
17-
"symfony/console": "~2.3",
18-
"symfony/dependency-injection": "~2.3",
19-
"symfony/framework-bundle": "~2.3",
20-
"symfony/http-foundation": "~2.3",
21-
"symfony/http-kernel": "~2.3",
22-
"cypresslab/gitelephant": "*"
17+
"php": ">=7.0.0",
18+
"symfony/config": "^2.3|^3.0|^4.0",
19+
"symfony/console": "^2.3|^3.0|^4.0",
20+
"symfony/dependency-injection": "^2.3|^3.0|^4.0",
21+
"symfony/framework-bundle": "^2.3|^3.0|^4.0",
22+
"symfony/http-foundation": "^2.3|^3.0|^4.0",
23+
"symfony/http-kernel": "^2.3|^3.0|^4.0",
24+
"cypresslab/gitelephant": "^3.0"
2325
},
2426
"autoload": {
25-
"psr-0": { "Cypress\\GitElephantBundle": "" }
27+
"psr-0": {
28+
"Cypress\\GitElephantBundle": ""
29+
}
2630
},
2731
"target-dir": "Cypress/GitElephantBundle"
2832
}

0 commit comments

Comments
 (0)