Merge pull request #415 from Lusitanian/author

Modify authors
daviddesberg · Sep 9, 2015 · 7b60bc7 · 7b60bc7
2 parents e32b9be + 164f7fc
commit 7b60bc7
Show file tree

Hide file tree

Showing 6 changed files with 624 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,6 @@
 .idea
 vendor
 .DS_Store
-composer.lock
 examples/init.php
 atlassian-ide-plugin.xml
 nbproject/
diff --git a/composer.json b/composer.json
@@ -11,6 +11,10 @@
         {
             "name": "Pieter Hordijk",
             "email": "[email protected]"
+        },
+        {
+            "name": "Elliot Chance",
+            "email": "[email protected]"
         }
     ],
     "require": {
@@ -19,7 +23,8 @@
     "require-dev": {
         "symfony/http-foundation": "~2.1",
         "predis/predis": "0.8.*@dev",
-        "phpunit/phpunit": "3.7.*"
+        "phpunit/phpunit": "3.7.*",
+        "squizlabs/php_codesniffer": "2.*"
     },
     "suggest": {
         "symfony/http-foundation": "Allows using the Symfony Session storage backend.",