From 0c8cc0aea764e5f046342fff3d3c8b702869443f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Faugeron?= <faugeron.loic@gmail.com>
Date: Tue, 1 Dec 2015 16:54:57 +0000
Subject: [PATCH] Updated dependencies

---
 .puli/GeneratedPuliFactory.php                | 56 -------------------
 .puli/bindings.json                           |  1 -
 LICENSE                                       |  2 +-
 README.md                                     |  2 +-
 composer.json                                 | 16 +++---
 config/Locate.php                             |  2 +-
 .../Line/ContractLineStrategySpec.php         |  2 +-
 .../Line/FileLineStrategySpec.php             |  2 +-
 .../TwigExtension/Line/LineSpec.php           |  2 +-
 .../Line/MethodPhpdocLineStrategySpec.php     |  2 +-
 .../Line/ObjectLineStrategySpec.php           |  2 +-
 .../Line/StructurePhpdocLineStrategySpec.php  |  2 +-
 .../TwigTemplateEngineSpec.php                |  2 +-
 .../Line/ContractLineStrategy.php             |  2 +-
 .../TwigExtension/Line/FileLineStrategy.php   |  2 +-
 .../TwigExtension/Line/Line.php               |  2 +-
 .../TwigExtension/Line/LineStrategy.php       |  2 +-
 .../Line/MethodPhpdocLineStrategy.php         |  2 +-
 .../TwigExtension/Line/ObjectLineStrategy.php |  2 +-
 .../Line/StructurePhpdocLineStrategy.php      |  2 +-
 .../TwigTemplateEngine/TwigExtension/Type.php |  2 +-
 .../TwigExtension/Whitespace.php              |  2 +-
 .../TwigTemplateEngine/TwigTemplateEngine.php |  2 +-
 23 files changed, 28 insertions(+), 85 deletions(-)
 delete mode 100644 .puli/GeneratedPuliFactory.php
 delete mode 100644 .puli/bindings.json

diff --git a/.puli/GeneratedPuliFactory.php b/.puli/GeneratedPuliFactory.php
deleted file mode 100644
index a3fe33f..0000000
--- a/.puli/GeneratedPuliFactory.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-namespace Puli;
-
-use Puli\Discovery\Api\ResourceDiscovery;
-use Puli\Discovery\KeyValueStoreDiscovery;
-use Puli\Factory\PuliFactory;
-use Puli\Repository\Api\ResourceRepository;
-use Puli\Repository\FilesystemRepository;
-use Webmozart\KeyValueStore\JsonFileStore;
-
-/**
- * Creates Puli's core services.
- *
- * This class was auto-generated by Puli.
- *
- * IMPORTANT: Before modifying the code below, set the "factory.auto-generate"
- * configuration key to false:
- *
- *     $ puli config factory.auto-generate false
- *
- * Otherwise any modifications will be overwritten!
- */
-class GeneratedPuliFactory implements PuliFactory
-{
-    /**
-     * Creates the resource repository.
-     *
-     * @return ResourceRepository The created resource repository.
-     */
-    public function createRepository()
-    {
-        if (!file_exists(__DIR__.'/repository')) {
-            mkdir(__DIR__.'/repository', 0777, true);
-        }
-
-        $repo = new FilesystemRepository(__DIR__.'/repository', true);
-
-        return $repo;
-    }
-
-    /**
-     * Creates the resource discovery.
-     *
-     * @param ResourceRepository $repo The resource repository to read from.
-     *
-     * @return ResourceDiscovery The created resource discovery.
-     */
-    public function createDiscovery(ResourceRepository $repo)
-    {
-        $store = new JsonFileStore(__DIR__.'/bindings.json', true);
-        $discovery = new KeyValueStoreDiscovery($repo, $store);
-
-        return $discovery;
-    }
-}
diff --git a/.puli/bindings.json b/.puli/bindings.json
deleted file mode 100644
index 9e26dfe..0000000
--- a/.puli/bindings.json
+++ /dev/null
@@ -1 +0,0 @@
-{}
\ No newline at end of file
diff --git a/LICENSE b/LICENSE
index ba0bc4d..7bf1a25 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2015 Loïc Chardonnet
+Copyright (c) 2015 Loïc Faugeron
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/README.md b/README.md
index 262c764..41b53c0 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ This package, `TwigTemplateEngine`, provides an implementation and templates for
 
 Install it using [Composer](https://getcomposer.org/download):
 
-    composer require memio/twig-template-engine:~1.0
+    composer require memio/twig-template-engine:^1.0
 
 ## Example
 
diff --git a/composer.json b/composer.json
index 1a2f7e1..68c3613 100644
--- a/composer.json
+++ b/composer.json
@@ -7,8 +7,8 @@
     "homepage": "http://memio.github.io/memio",
     "authors": [
         {
-            "name": "Loïc Chardonnet",
-            "email": "loic.chardonnet@gmail.com",
+            "name": "Loïc Faugeron",
+            "email": "faugeron.loic@gmail.com",
             "homepage": "http://gnugat.github.io",
             "role": "Developer"
         }
@@ -18,13 +18,13 @@
         "Memio\\TwigTemplateEngine\\Config\\": "config"
     }},
     "require": {
-        "memio/model": "~1.3",
-        "memio/pretty-printer": "~1.0",
-        "php": ">=5.3.3",
-        "twig/twig": "~1.18"
+        "memio/model": "^1.3",
+        "memio/pretty-printer": "^1.0",
+        "php": "^5.3|^7.0",
+        "twig/twig": "^1.18"
     },
     "require-dev": {
-        "fabpot/php-cs-fixer": "~1.6",
-        "phpspec/phpspec": "~2.2"
+        "fabpot/php-cs-fixer": "^1.6",
+        "phpspec/phpspec": "^2.4"
     }
 }
diff --git a/config/Locate.php b/config/Locate.php
index f595eee..c2c6ca8 100644
--- a/config/Locate.php
+++ b/config/Locate.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the memio/twig-template-engine package.
  *
- * (c) Loïc Chardonnet <loic.chardonnet@gmail.com>
+ * (c) Loïc Faugeron <faugeron.loic@gmail.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/spec/Memio/TwigTemplateEngine/TwigExtension/Line/ContractLineStrategySpec.php b/spec/Memio/TwigTemplateEngine/TwigExtension/Line/ContractLineStrategySpec.php
index ace7c01..5638255 100644
--- a/spec/Memio/TwigTemplateEngine/TwigExtension/Line/ContractLineStrategySpec.php
+++ b/spec/Memio/TwigTemplateEngine/TwigExtension/Line/ContractLineStrategySpec.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the memio/twig-template-engine package.
  *
- * (c) Loïc Chardonnet <loic.chardonnet@gmail.com>
+ * (c) Loïc Faugeron <faugeron.loic@gmail.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/spec/Memio/TwigTemplateEngine/TwigExtension/Line/FileLineStrategySpec.php b/spec/Memio/TwigTemplateEngine/TwigExtension/Line/FileLineStrategySpec.php
index 59fd975..0f2fbd6 100644
--- a/spec/Memio/TwigTemplateEngine/TwigExtension/Line/FileLineStrategySpec.php
+++ b/spec/Memio/TwigTemplateEngine/TwigExtension/Line/FileLineStrategySpec.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the memio/twig-template-engine package.
  *
- * (c) Loïc Chardonnet <loic.chardonnet@gmail.com>
+ * (c) Loïc Faugeron <faugeron.loic@gmail.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/spec/Memio/TwigTemplateEngine/TwigExtension/Line/LineSpec.php b/spec/Memio/TwigTemplateEngine/TwigExtension/Line/LineSpec.php
index e45487c..4a13436 100644
--- a/spec/Memio/TwigTemplateEngine/TwigExtension/Line/LineSpec.php
+++ b/spec/Memio/TwigTemplateEngine/TwigExtension/Line/LineSpec.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the memio/twig-template-engine package.
  *
- * (c) Loïc Chardonnet <loic.chardonnet@gmail.com>
+ * (c) Loïc Faugeron <faugeron.loic@gmail.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/spec/Memio/TwigTemplateEngine/TwigExtension/Line/MethodPhpdocLineStrategySpec.php b/spec/Memio/TwigTemplateEngine/TwigExtension/Line/MethodPhpdocLineStrategySpec.php
index e66f604..b7ef347 100644
--- a/spec/Memio/TwigTemplateEngine/TwigExtension/Line/MethodPhpdocLineStrategySpec.php
+++ b/spec/Memio/TwigTemplateEngine/TwigExtension/Line/MethodPhpdocLineStrategySpec.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the memio/twig-template-engine package.
  *
- * (c) Loïc Chardonnet <loic.chardonnet@gmail.com>
+ * (c) Loïc Faugeron <faugeron.loic@gmail.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/spec/Memio/TwigTemplateEngine/TwigExtension/Line/ObjectLineStrategySpec.php b/spec/Memio/TwigTemplateEngine/TwigExtension/Line/ObjectLineStrategySpec.php
index aa6218a..b3e1086 100644
--- a/spec/Memio/TwigTemplateEngine/TwigExtension/Line/ObjectLineStrategySpec.php
+++ b/spec/Memio/TwigTemplateEngine/TwigExtension/Line/ObjectLineStrategySpec.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the memio/twig-template-engine package.
  *
- * (c) Loïc Chardonnet <loic.chardonnet@gmail.com>
+ * (c) Loïc Faugeron <faugeron.loic@gmail.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/spec/Memio/TwigTemplateEngine/TwigExtension/Line/StructurePhpdocLineStrategySpec.php b/spec/Memio/TwigTemplateEngine/TwigExtension/Line/StructurePhpdocLineStrategySpec.php
index a802307..a6c261c 100644
--- a/spec/Memio/TwigTemplateEngine/TwigExtension/Line/StructurePhpdocLineStrategySpec.php
+++ b/spec/Memio/TwigTemplateEngine/TwigExtension/Line/StructurePhpdocLineStrategySpec.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the memio/twig-template-engine package.
  *
- * (c) Loïc Chardonnet <loic.chardonnet@gmail.com>
+ * (c) Loïc Faugeron <faugeron.loic@gmail.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/spec/Memio/TwigTemplateEngine/TwigTemplateEngineSpec.php b/spec/Memio/TwigTemplateEngine/TwigTemplateEngineSpec.php
index 17209a7..97e8218 100644
--- a/spec/Memio/TwigTemplateEngine/TwigTemplateEngineSpec.php
+++ b/spec/Memio/TwigTemplateEngine/TwigTemplateEngineSpec.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the memio/twig-template-engine package.
  *
- * (c) Loïc Chardonnet <loic.chardonnet@gmail.com>
+ * (c) Loïc Faugeron <faugeron.loic@gmail.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/src/Memio/TwigTemplateEngine/TwigExtension/Line/ContractLineStrategy.php b/src/Memio/TwigTemplateEngine/TwigExtension/Line/ContractLineStrategy.php
index 54a5cbd..e79b3f1 100644
--- a/src/Memio/TwigTemplateEngine/TwigExtension/Line/ContractLineStrategy.php
+++ b/src/Memio/TwigTemplateEngine/TwigExtension/Line/ContractLineStrategy.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the memio/twig-template-engine package.
  *
- * (c) Loïc Chardonnet <loic.chardonnet@gmail.com>
+ * (c) Loïc Faugeron <faugeron.loic@gmail.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/src/Memio/TwigTemplateEngine/TwigExtension/Line/FileLineStrategy.php b/src/Memio/TwigTemplateEngine/TwigExtension/Line/FileLineStrategy.php
index ce38461..42ec1da 100644
--- a/src/Memio/TwigTemplateEngine/TwigExtension/Line/FileLineStrategy.php
+++ b/src/Memio/TwigTemplateEngine/TwigExtension/Line/FileLineStrategy.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the memio/twig-template-engine package.
  *
- * (c) Loïc Chardonnet <loic.chardonnet@gmail.com>
+ * (c) Loïc Faugeron <faugeron.loic@gmail.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/src/Memio/TwigTemplateEngine/TwigExtension/Line/Line.php b/src/Memio/TwigTemplateEngine/TwigExtension/Line/Line.php
index a16169c..03c0b2f 100644
--- a/src/Memio/TwigTemplateEngine/TwigExtension/Line/Line.php
+++ b/src/Memio/TwigTemplateEngine/TwigExtension/Line/Line.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the memio/twig-template-engine package.
  *
- * (c) Loïc Chardonnet <loic.chardonnet@gmail.com>
+ * (c) Loïc Faugeron <faugeron.loic@gmail.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/src/Memio/TwigTemplateEngine/TwigExtension/Line/LineStrategy.php b/src/Memio/TwigTemplateEngine/TwigExtension/Line/LineStrategy.php
index 6140e2a..5da60c4 100644
--- a/src/Memio/TwigTemplateEngine/TwigExtension/Line/LineStrategy.php
+++ b/src/Memio/TwigTemplateEngine/TwigExtension/Line/LineStrategy.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the memio/twig-template-engine package.
  *
- * (c) Loïc Chardonnet <loic.chardonnet@gmail.com>
+ * (c) Loïc Faugeron <faugeron.loic@gmail.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/src/Memio/TwigTemplateEngine/TwigExtension/Line/MethodPhpdocLineStrategy.php b/src/Memio/TwigTemplateEngine/TwigExtension/Line/MethodPhpdocLineStrategy.php
index af53879..ed83c29 100644
--- a/src/Memio/TwigTemplateEngine/TwigExtension/Line/MethodPhpdocLineStrategy.php
+++ b/src/Memio/TwigTemplateEngine/TwigExtension/Line/MethodPhpdocLineStrategy.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the memio/twig-template-engine package.
  *
- * (c) Loïc Chardonnet <loic.chardonnet@gmail.com>
+ * (c) Loïc Faugeron <faugeron.loic@gmail.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/src/Memio/TwigTemplateEngine/TwigExtension/Line/ObjectLineStrategy.php b/src/Memio/TwigTemplateEngine/TwigExtension/Line/ObjectLineStrategy.php
index b95e410..b02479d 100644
--- a/src/Memio/TwigTemplateEngine/TwigExtension/Line/ObjectLineStrategy.php
+++ b/src/Memio/TwigTemplateEngine/TwigExtension/Line/ObjectLineStrategy.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the memio/twig-template-engine package.
  *
- * (c) Loïc Chardonnet <loic.chardonnet@gmail.com>
+ * (c) Loïc Faugeron <faugeron.loic@gmail.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/src/Memio/TwigTemplateEngine/TwigExtension/Line/StructurePhpdocLineStrategy.php b/src/Memio/TwigTemplateEngine/TwigExtension/Line/StructurePhpdocLineStrategy.php
index e67e667..5b2d695 100644
--- a/src/Memio/TwigTemplateEngine/TwigExtension/Line/StructurePhpdocLineStrategy.php
+++ b/src/Memio/TwigTemplateEngine/TwigExtension/Line/StructurePhpdocLineStrategy.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the memio/twig-template-engine package.
  *
- * (c) Loïc Chardonnet <loic.chardonnet@gmail.com>
+ * (c) Loïc Faugeron <faugeron.loic@gmail.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/src/Memio/TwigTemplateEngine/TwigExtension/Type.php b/src/Memio/TwigTemplateEngine/TwigExtension/Type.php
index f98bd4e..77fb533 100644
--- a/src/Memio/TwigTemplateEngine/TwigExtension/Type.php
+++ b/src/Memio/TwigTemplateEngine/TwigExtension/Type.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the memio/twig-template-engine package.
  *
- * (c) Loïc Chardonnet <loic.chardonnet@gmail.com>
+ * (c) Loïc Faugeron <faugeron.loic@gmail.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/src/Memio/TwigTemplateEngine/TwigExtension/Whitespace.php b/src/Memio/TwigTemplateEngine/TwigExtension/Whitespace.php
index c67aac4..141ff59 100644
--- a/src/Memio/TwigTemplateEngine/TwigExtension/Whitespace.php
+++ b/src/Memio/TwigTemplateEngine/TwigExtension/Whitespace.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the memio/twig-template-engine package.
  *
- * (c) Loïc Chardonnet <loic.chardonnet@gmail.com>
+ * (c) Loïc Faugeron <faugeron.loic@gmail.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/src/Memio/TwigTemplateEngine/TwigTemplateEngine.php b/src/Memio/TwigTemplateEngine/TwigTemplateEngine.php
index 1d1d9c9..cb5c635 100644
--- a/src/Memio/TwigTemplateEngine/TwigTemplateEngine.php
+++ b/src/Memio/TwigTemplateEngine/TwigTemplateEngine.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the memio/twig-template-engine package.
  *
- * (c) Loïc Chardonnet <loic.chardonnet@gmail.com>
+ * (c) Loïc Faugeron <faugeron.loic@gmail.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.