Skip to content

Commit 2ac56a4

Browse files
committed
Merge pull request #2 from temp/master
bump version, readme fix
2 parents 2f554fb + a08f54f commit 2ac56a4

5 files changed

Lines changed: 9 additions & 106 deletions

File tree

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
11
vendor
2+
composer.lock
3+
.idea/

.travis.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ php:
44
- 5.3
55
- 5.3.3
66
- 5.4
7+
- 5.5
78

8-
before_script: composer install --dev
9+
before_script: composer install --prefer-source
910

10-
script: phpunit -c tests
11+
script: phpunit -c tests

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Blocking Component [![Build Status](https://travis-ci.org/brainbits/blocking.png?branch=master)](https://travis-ci.org/brainbits/blocking) [![SensioLabsInsight](https://insight.sensiolabs.com/projects/bc35527c-11d8-45a1-a482-18d376cfe382/mini.png)](https://insight.sensiolabs.com/projects/bc35527c-11d8-45a1-a482-18d376cfe382)
22
==================
3-
The Locking Component provides methods to manager content based blocking.
3+
The Blocking Component provides methods to manage content based blocking.
44

55
<?php
66

composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "brainbits/blocking",
33
"description": "Object blocking",
4-
"keywords": [],
4+
"keywords": ["block", "blocking", "async"],
55
"homepage": "http://brainbits.net",
66
"license": "MIT",
77
"authors": [
@@ -12,10 +12,10 @@
1212
],
1313
"require": {
1414
"php": ">=5.3.0",
15-
"symfony/http-foundation": ">=2.1"
15+
"symfony/http-foundation": "2.3.*"
1616
},
1717
"require-dev": {
18-
"mikey179/vfsStream": "1.1.*"
18+
"mikey179/vfsStream": "1.2.*"
1919
},
2020
"autoload": {
2121
"psr-0": { "Brainbits": "src/" }

composer.lock

Lines changed: 0 additions & 100 deletions
This file was deleted.

0 commit comments

Comments
 (0)