Permalink
Browse files

Fixed LICENSE

  • Loading branch information...
1 parent ddb398d commit 04bdcb1f18ba184cd8912ab3532259656184f8d3 @willdurand willdurand committed Feb 18, 2012
Showing with 28 additions and 11 deletions.
  1. +19 −0 LICENSE
  2. +4 −5 src/Propel/Silex/PropelServiceProvider.php
  3. +5 −6 tests/Propel/Tests/Silex/PropelServiceProviderTest.php
View
19 LICENSE
@@ -0,0 +1,19 @@
+Copyright (c) 2011-2012 Cristiano Cinotti, William Durand
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
@@ -1,12 +1,11 @@
<?php
-/*
- * This file is part of the Silex framework.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
+/**
+ * This file is part of the PropelServiceProvider package.
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
+ *
+ * @license MIT License
*/
namespace Propel\Silex;
@@ -1,12 +1,11 @@
<?php
-/*
- * This file is part of the Silex framework.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
+/**
+ * This file is part of the PropelServiceProvider package.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
+ * @license MIT License
*/
namespace Propel\Tests\Silex;

0 comments on commit 04bdcb1

Please sign in to comment.