Skip to content

Commit

Permalink
Updating license from LGPL to MIT
Browse files Browse the repository at this point in the history
  • Loading branch information
@Ocramius
Ocramius committed May 31, 2012
1 parent c46424d commit 449211c
Show file tree
Hide file tree
Showing 8 changed files with 76 additions and 47 deletions.
14 changes: 14 additions & 0 deletions LICENSE
View file
@@ -0,0 +1,14 @@
Copyright (c) 2006-2012 Doctrine Project

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.
4 changes: 2 additions & 2 deletions Module.php
View file
Expand Up @@ -13,7 +13,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* *
* This software consists of voluntary contributions made by many individuals * This software consists of voluntary contributions made by many individuals
* and is licensed under the LGPL. For more information, see * and is licensed under the MIT license. For more information, see
* <http://www.doctrine-project.org>. * <http://www.doctrine-project.org>.
*/ */


Expand All @@ -29,7 +29,7 @@
/** /**
* Doctrine Module provider for Mongo DB ODM. * Doctrine Module provider for Mongo DB ODM.
* *
* @license http://www.opensource.org/licenses/lgpl-license.php LGPL * @license MIT
* @link http://www.doctrine-project.org * @link http://www.doctrine-project.org
* @since 0.1.0 * @since 0.1.0
* @author Kyle Spraggs <theman@spiffyjr.me> * @author Kyle Spraggs <theman@spiffyjr.me>
Expand Down
1 change: 1 addition & 0 deletions composer.json
View file
Expand Up @@ -10,6 +10,7 @@
"zf2" "zf2"
], ],
"homepage": "http://www.doctrine-project.org/", "homepage": "http://www.doctrine-project.org/",
"license": "MIT",
"authors": [ "authors": [
{ {
"name": "Kyle Spraggs", "name": "Kyle Spraggs",
Expand Down
24 changes: 21 additions & 3 deletions config/module.config.php
View file
@@ -1,4 +1,22 @@
<?php <?php
/*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* This software consists of voluntary contributions made by many individuals
* and is licensed under the MIT license. For more information, see
* <http://www.doctrine-project.org>.
*/

return array( return array(


'doctrine_mongoodm_module' => array( 'doctrine_mongoodm_module' => array(
Expand All @@ -23,7 +41,7 @@
'conn' => array('type' => 'DoctrineMongoODMModule\Doctrine\ODM\MongoDB\Connection', 'required' => true) 'conn' => array('type' => 'DoctrineMongoODMModule\Doctrine\ODM\MongoDB\Connection', 'required' => true)
), ),
), ),
), ),
), ),
), ),
'instance' => array( 'instance' => array(
Expand Down Expand Up @@ -95,8 +113,8 @@
'parameters' => array( 'parameters' => array(
'objectManager' => 'mongo_dm', 'objectManager' => 'mongo_dm',
), ),
), ),

// Commands to be attached to CLI tools // Commands to be attached to CLI tools
'doctrine_cli' => array( 'doctrine_cli' => array(
'injections' => array( 'injections' => array(
Expand Down
39 changes: 19 additions & 20 deletions src/DoctrineMongoODMModule/Doctrine/ODM/MongoDB/Configuration.php
View file
Expand Up @@ -13,7 +13,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* *
* This software consists of voluntary contributions made by many individuals * This software consists of voluntary contributions made by many individuals
* and is licensed under the LGPL. For more information, see * and is licensed under the MIT license. For more information, see
* <http://www.doctrine-project.org>. * <http://www.doctrine-project.org>.
*/ */


Expand All @@ -28,17 +28,16 @@
* Wrapper for MongoDB configuration that helps setup configuration without relying * Wrapper for MongoDB configuration that helps setup configuration without relying
* entirely on Di. * entirely on Di.
* *
* @license http://www.opensource.org/licenses/lgpl-license.php LGPL * @license MIT
* @link www.doctrine-project.org * @link http://www.doctrine-project.org
* @since 1.0 * @since 0.1.0
* @version $Revision$
* @author Kyle Spraggs <theman@spiffyjr.me> * @author Kyle Spraggs <theman@spiffyjr.me>
*/ */
class Configuration extends Instance class Configuration extends Instance
{ {
/** /**
* Definition for configuration options. * Definition for configuration options.
* *
* @var array * @var array
*/ */
protected $definition = array( protected $definition = array(
Expand All @@ -54,25 +53,25 @@ class Configuration extends Instance
'default_db' => 'string' 'default_db' => 'string'
) )
); );

/** /**
* @var Doctrine\ORM\Mapping\Driver\Driver * @var Doctrine\ORM\Mapping\Driver\Driver
*/ */
protected $metadataDriver; protected $metadataDriver;

/** /**
* @var Doctrine\Common\Cache\Cache * @var Doctrine\Common\Cache\Cache
*/ */
protected $metadataCache; protected $metadataCache;

/** /**
* @var Doctrine\DBAL\Logging\SQLLogger * @var Doctrine\DBAL\Logging\SQLLogger
*/ */
protected $logger; protected $logger;

/** /**
* Constructor. * Constructor.
* *
* @param array $opts * @param array $opts
* @param Driver $metadataDriver * @param Driver $metadataDriver
* @param Cache $metadataCache * @param Cache $metadataCache
Expand All @@ -83,14 +82,14 @@ public function __construct(array $opts, $metadataDriver, Cache $metadataCache,
if ($metadataDriver instanceof DriverChain) { if ($metadataDriver instanceof DriverChain) {
$metadataDriver = $metadataDriver->getInstance(); $metadataDriver = $metadataDriver->getInstance();
} }

$this->metadataDriver = $metadataDriver; $this->metadataDriver = $metadataDriver;
$this->metadataCache = $metadataCache; $this->metadataCache = $metadataCache;
$this->logger = $logger; $this->logger = $logger;

parent::__construct($opts); parent::__construct($opts);
} }

protected function loadInstance() protected function loadInstance()
{ {
$opts = $this->opts; $opts = $this->opts;
Expand All @@ -100,24 +99,24 @@ protected function loadInstance()
$config->setAutoGenerateProxyClasses($opts['auto_generate_proxies']); $config->setAutoGenerateProxyClasses($opts['auto_generate_proxies']);
$config->setProxyDir($opts['proxy_dir']); $config->setProxyDir($opts['proxy_dir']);
$config->setProxyNamespace($opts['proxy_namespace']); $config->setProxyNamespace($opts['proxy_namespace']);

// hydrators // hydrators
$config->setAutoGenerateHydratorClasses($opts['auto_generate_hydrators']); $config->setAutoGenerateHydratorClasses($opts['auto_generate_hydrators']);
$config->setHydratorDir($opts['hydrator_dir']); $config->setHydratorDir($opts['hydrator_dir']);
$config->setHydratorNamespace($opts['hydrator_namespace']); $config->setHydratorNamespace($opts['hydrator_namespace']);

// default db // default db
$config->setDefaultDB($opts['default_db']); $config->setDefaultDB($opts['default_db']);

// caching // caching
$config->setMetadataCacheImpl($this->metadataCache); $config->setMetadataCacheImpl($this->metadataCache);


// logger // logger
$config->setLoggerCallable($this->logger); $config->setLoggerCallable($this->logger);

// finally, the driver // finally, the driver
$config->setMetadataDriverImpl($this->metadataDriver); $config->setMetadataDriverImpl($this->metadataDriver);

$this->instance = $config; $this->instance = $config;
} }
} }
23 changes: 11 additions & 12 deletions src/DoctrineMongoODMModule/Doctrine/ODM/MongoDB/Connection.php
View file
Expand Up @@ -13,7 +13,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* *
* This software consists of voluntary contributions made by many individuals * This software consists of voluntary contributions made by many individuals
* and is licensed under the LGPL. For more information, see * and is licensed under the MIT license. For more information, see
* <http://www.doctrine-project.org>. * <http://www.doctrine-project.org>.
*/ */


Expand All @@ -27,10 +27,9 @@
* Wrapper for MongoDB connection that helps setup configuration without relying * Wrapper for MongoDB connection that helps setup configuration without relying
* entirely on Di. * entirely on Di.
* *
* @license http://www.opensource.org/licenses/lgpl-license.php LGPL * @license MIT
* @link www.doctrine-project.org * @link http://www.doctrine-project.org
* @since 1.0 * @since 0.1.0
* @version $Revision$
* @author Kyle Spraggs <theman@spiffyjr.me> * @author Kyle Spraggs <theman@spiffyjr.me>
*/ */
class Connection extends Instance class Connection extends Instance
Expand All @@ -39,25 +38,25 @@ class Connection extends Instance
* @var Doctrine\ORM\Configuration * @var Doctrine\ORM\Configuration
*/ */
protected $config; protected $config;

/** /**
* @var Doctrine\Common\EventManager * @var Doctrine\Common\EventManager
*/ */
protected $evm; protected $evm;

/** /**
* @var null|Mongo * @var null|Mongo
*/ */
protected $server; protected $server;

/** /**
* @var array * @var array
*/ */
protected $options = array(); protected $options = array();

/** /**
* Constructor * Constructor
* *
* @param null|Mongo $server * @param null|Mongo $server
* @param array $options * @param array $options
* @param Configuration $config * @param Configuration $config
Expand All @@ -73,10 +72,10 @@ public function __construct(
$this->options = $options ? $options : array(); $this->options = $options ? $options : array();
$this->config = $config ? $config->getInstance() : null; $this->config = $config ? $config->getInstance() : null;
$this->evm = $evm ? $evm->getInstance() : null; $this->evm = $evm ? $evm->getInstance() : null;

parent::__construct(array()); parent::__construct(array());
} }

protected function loadInstance() protected function loadInstance()
{ {
$this->instance = new MongoConnection( $this->instance = new MongoConnection(
Expand Down
9 changes: 4 additions & 5 deletions src/DoctrineMongoODMModule/Doctrine/ODM/MongoDB/DriverChain.php
View file
Expand Up @@ -13,7 +13,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* *
* This software consists of voluntary contributions made by many individuals * This software consists of voluntary contributions made by many individuals
* and is licensed under the LGPL. For more information, see * and is licensed under the MIT license. For more information, see
* <http://www.doctrine-project.org>. * <http://www.doctrine-project.org>.
*/ */


Expand All @@ -26,10 +26,9 @@
* Wrapper for MongoDB driver chain that helps setup configuration without relying * Wrapper for MongoDB driver chain that helps setup configuration without relying
* entirely on Di. * entirely on Di.
* *
* @license http://www.opensource.org/licenses/lgpl-license.php LGPL * @license MIT
* @link www.doctrine-project.org * @link http://www.doctrine-project.org
* @since 1.0 * @since 0.1.0
* @version $Revision$
* @author Kyle Spraggs <theman@spiffyjr.me> * @author Kyle Spraggs <theman@spiffyjr.me>
*/ */
class DriverChain extends CommonDriverChain class DriverChain extends CommonDriverChain
Expand Down
9 changes: 4 additions & 5 deletions src/DoctrineMongoODMModule/Factory/DocumentManager.php
View file
Expand Up @@ -13,7 +13,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* *
* This software consists of voluntary contributions made by many individuals * This software consists of voluntary contributions made by many individuals
* and is licensed under the LGPL. For more information, see * and is licensed under the MIT license. For more information, see
* <http://www.doctrine-project.org>. * <http://www.doctrine-project.org>.
*/ */


Expand All @@ -26,10 +26,9 @@
/** /**
* Doctrine MongoDB document manager factory. * Doctrine MongoDB document manager factory.
* *
* @license http://www.opensource.org/licenses/lgpl-license.php LGPL * @license MIT
* @link www.doctrine-project.org * @link http://www.doctrine-project.org
* @since 1.0 * @since 0.1.0
* @version $Revision$
* @author Kyle Spraggs <theman@spiffyjr.me> * @author Kyle Spraggs <theman@spiffyjr.me>
*/ */
class DocumentManager class DocumentManager
Expand Down

0 comments on commit 449211c

Please sign in to comment.