Merge branch 'new_config'

mitchellvanw · mitchellvanw · commit 0e0dd69ec3ed · 2014-09-22T12:26:20.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,6 @@
 /vendor
+/.idea
 composer.phar
 composer.lock
 .DS_Store
+.idea/*
diff --git a/README.md b/README.md
@@ -29,6 +29,10 @@ Begin reading [the full documentation](https://github.com/mitchellvanw/laravel-d
 At the moment Doctrine\ORM version 2.5 is still in beta. As a result the composer install may require you to change
 the `minimum-stability` in your `composer.json` to `dev`.
 
+If you don't want to affect the stability of the rest of the packages, you can add the following property in your `composer.json`:
+
+"prefer-stable": true
+
 ## Installation
 
 Begin by installing the package through Composer. Edit your project's `composer.json` to require `mitchellvanw/laravel-doctrine`.
diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "mitchellvanw/laravel-doctrine",
     "description": "The Doctrine 2 implementation that melts with Laravel 4",
-    "version": "0.4.2",
+    "version": "0.4.3",
     "keywords": ["doctrine", "doctrine 2", "orm", "laravel"],
     "license": "MIT",
     "authors": [
@@ -11,14 +11,19 @@
         }
     ],
     "require": {
-        "php": ">=5.4.0",
-        "illuminate/support": "4.*",
+        "php": ">=5.5.0",
+        "illuminate/support": "4.*|5.*",
         "doctrine/orm": "2.5.*",
         "doctrine/migrations": "1.*"
     },
+	"require-dev": {
+		"mockery/mockery": "dev-master",
+		"phpunit/phpunit": "3.7.*"
+	},
     "autoload": {
         "psr-4": {
-            "Mitch\\LaravelDoctrine\\": "src/"
+            "Mitch\\LaravelDoctrine\\": "src/",
+	        "Tests\\": "tests/"
         }
     },
     "minimum-stability": "dev"
diff --git a/config/doctrine.php b/config/doctrine.php
@@ -30,5 +30,7 @@
 
     'repository' => 'Doctrine\ORM\EntityRepository',
 
+    'repositoryFactory' => null,
+
     'logger' => null
 ];
diff --git a/phpunit.xml b/phpunit.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit backupGlobals="false"
+         backupStaticAttributes="false"
+         bootstrap="vendor/autoload.php"
+         colors="true"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         processIsolation="false"
+         stopOnFailure="false"
+         syntaxCheck="false"
+        >
+    <testsuites>
+        <testsuite name="all">
+            <directory suffix="Test.php">./tests/</directory>
+        </testsuite>
+    </testsuites>
+</phpunit>
diff --git a/src/Cache/ApcProvider.php b/src/Cache/ApcProvider.php
@@ -1,4 +1,4 @@
-<?php namespace Mitch\LaravelDoctrine\CacheProviders; 
+<?php namespace Mitch\LaravelDoctrine\Cache;
 
 use Doctrine\Common\Cache\ApcCache;
 
diff --git a/src/Cache/MemcacheProvider.php b/src/Cache/MemcacheProvider.php
@@ -1,4 +1,4 @@
-<?php namespace Mitch\LaravelDoctrine\CacheProviders; 
+<?php namespace Mitch\LaravelDoctrine\Cache;
 
 use Doctrine\Common\Cache\MemcacheCache;
 use Memcache;
diff --git a/src/Cache/NullProvider.php b/src/Cache/NullProvider.php
@@ -1,4 +1,4 @@
-<?php namespace Mitch\LaravelDoctrine\CacheProviders;
+<?php namespace Mitch\LaravelDoctrine\Cache;
 
 class NullProvider implements Provider
 {
diff --git a/src/Cache/Provider.php b/src/Cache/Provider.php
@@ -1,4 +1,4 @@
-<?php namespace Mitch\LaravelDoctrine\CacheProviders; 
+<?php namespace Mitch\LaravelDoctrine\Cache;
 
 interface Provider
 {
diff --git a/src/Cache/RedisProvider.php b/src/Cache/RedisProvider.php
@@ -1,4 +1,4 @@
-<?php namespace Mitch\LaravelDoctrine\CacheProviders; 
+<?php namespace Mitch\LaravelDoctrine\Cache;
 
 use Doctrine\Common\Cache\RedisCache;
 use Redis;
diff --git a/src/Cache/XcacheProvider.php b/src/Cache/XcacheProvider.php
@@ -1,4 +1,4 @@
-<?php namespace Mitch\LaravelDoctrine\CacheProviders; 
+<?php namespace Mitch\LaravelDoctrine\Cache;
 
 use Doctrine\Common\Cache\XcacheCache;
 
diff --git a/src/CacheManager.php b/src/CacheManager.php
@@ -1,6 +1,6 @@
 <?php namespace Mitch\LaravelDoctrine; 
 
-use Mitch\LaravelDoctrine\CacheProviders\Provider;
+use Mitch\LaravelDoctrine\Cache\Provider;
 
 class CacheManager
 {
diff --git a/src/Configuration/DriverMapper.php b/src/Configuration/DriverMapper.php
@@ -0,0 +1,40 @@
+<?php namespace Mitch\LaravelDoctrine\Configuration;
+
+use Exception;
+
+class DriverMapper
+{
+	/**
+	 * An array of mappers that can be cycled through to determine which mapper
+	 * is appropriate for a given configuration arrangement.
+	 *
+	 * @var array
+	 */
+	private $mappers = [];
+
+	/**
+	 * Register a new driver configuration mapper.
+	 *
+	 * @param Mapper $mapper
+	 */
+	public function registerMapper(Mapper $mapper)
+	{
+		$this->mappers[] = $mapper;
+	}
+
+	/**
+	 * Map the Laravel configuration to a configuration driver, return the result.
+	 *
+	 * @param $configuration
+	 * @return array
+	 * @throws Exception
+	 */
+	public function map($configuration)
+	{
+		foreach ($this->mappers as $mapper)
+			if ($mapper->isAppropriateFor($configuration))
+				return $mapper->map($configuration);
+
+		throw new Exception("Driver {$configuration['driver']} unsupported by package at this time.");
+	}
+}
diff --git a/src/Configuration/Mapper.php b/src/Configuration/Mapper.php
@@ -0,0 +1,20 @@
+<?php namespace Mitch\LaravelDoctrine\Configuration;
+
+interface Mapper
+{
+	/**
+	 * Handles the mapping of configuration.
+	 *
+	 * @param array $configuration
+	 * @return mixed
+	 */
+	public function map(array $configuration);
+
+	/**
+	 * Determines whether the configuration array is appropriate for the mapper.
+	 *
+	 * @param array $configuration
+	 * @return mixed
+	 */
+	public function isAppropriateFor(array $configuration);
+}
diff --git a/src/Configuration/SqlMapper.php b/src/Configuration/SqlMapper.php
@@ -0,0 +1,46 @@
+<?php namespace Mitch\LaravelDoctrine\Configuration;
+
+class SqlMapper implements Mapper
+{
+	/**
+	 * Creates the configuration mapping for SQL database engines, including SQL server, MySQL and PostgreSQL.
+	 *
+	 * @param array $configuration
+	 * @return array
+	 */
+	public function map(array $configuration)
+	{
+		return [
+			'driver' => $this->driver($configuration['driver']),
+			'host' => $configuration['host'],
+			'dbname' => $configuration['database'],
+			'user' => $configuration['username'],
+			'password' => $configuration['password'],
+			'charset' => $configuration['charset']
+		];
+	}
+
+	/**
+	 * Is suitable for mapping configurations that use a mysql, postgres or sqlserv setup.
+	 *
+	 * @param array $configuration
+	 * @return boolean
+	 */
+	public function isAppropriateFor(array $configuration)
+	{
+		return in_array($configuration['driver'], ['sqlsrv', 'mysql', 'pgsql']);
+	}
+
+	/**
+	 * Maps the Laravel driver syntax to an Sql doctrine format.
+	 *
+	 * @param $l4Driver
+	 * @return string
+	 */
+	public function driver($l4Driver)
+	{
+		$doctrineDrivers = ['mysql' => 'pdo_mysql', 'sqlsrv' => 'pdo_sqlsrv', 'pgsql' => 'pdo_pgsql'];
+
+		return $doctrineDrivers[$l4Driver];
+	}
+}
diff --git a/src/Configuration/SqliteMapper.php b/src/Configuration/SqliteMapper.php
@@ -0,0 +1,46 @@
+<?php namespace Mitch\LaravelDoctrine\Configuration;
+
+class SqliteMapper implements Mapper
+{
+	/**
+	 * Map the L4 configuration array to a sqlite-friendly doctrine configuration.
+	 *
+	 * @param array $configuration
+	 * @return array
+	 */
+	public function map(array $configuration)
+	{
+		$sqliteConfig = [
+			'driver' => 'pdo_sqlite',
+			'user' => @$configuration['username'],
+			'password' => @$configuration['password']
+		];
+		$this->databaseLocation($configuration, $sqliteConfig);
+		return $sqliteConfig;
+	}
+
+	/**
+	 * Is only suitable for sqlite configuration mapping.
+	 *
+	 * @param array $configuration
+	 * @return bool
+	 */
+	public function isAppropriateFor(array $configuration)
+	{
+		return $configuration['driver'] == 'sqlite';
+	}
+
+	/**
+	 * Determines the location of the database and appends this to the sqlite configuration.
+	 *
+	 * @param $configuration
+	 * @param $sqliteConfig
+	 */
+	private function databaseLocation($configuration, &$sqliteConfig)
+	{
+		if ($configuration['database'] == ':memory:')
+			$sqliteConfig['memory'] = true;
+		else
+			$sqliteConfig['path'] = app_path('database').'/'.$configuration['database'].'.sqlite';
+	}
+} 
diff --git a/src/Console/SchemaCreateCommand.php b/src/Console/SchemaCreateCommand.php
@@ -51,9 +51,9 @@ public function __construct(SchemaTool $tool, ClassMetadataFactory $metadata)
     public function fire()
     {
         if ($this->option('sql')) {
-            $this->info('Outputting create query:');
+            $this->info('Outputting create query:'.PHP_EOL);
             $sql = $this->tool->getCreateSchemaSql($this->metadata->getAllMetadata());
-            $this->info(implode(';' . PHP_EOL, $sql));
+            $this->info(implode(';'.PHP_EOL, $sql));
         } else {
             $this->info('Creating database schema...');
             $this->tool->createSchema($this->metadata->getAllMetadata());
diff --git a/src/Filters/TrashedFilter.php b/src/Filters/TrashedFilter.php
@@ -7,10 +7,7 @@ class TrashedFilter extends SQLFilter
 {
     public function addFilterConstraint(ClassMetadata $metadata, $table)
     {
-        if ($this->isSoftDeletable($metadata->rootEntityName))
-            return "{$table}.deleted_at IS NULL || NOW() < {$table}.deleted_at";
-
-        return '';
+        return $this->isSoftDeletable($metadata->rootEntityName) ? "{$table}.deleted_at IS NULL OR CURRENT_TIMESTAMP < {$table}.deleted_at" : '';
     }
 
     private function isSoftDeletable($entity)
diff --git a/src/LaravelDoctrineServiceProvider.php b/src/LaravelDoctrineServiceProvider.php
diff --git a/src/Traits/RememberToken.php b/src/Traits/RememberToken.php
diff --git a/src/Traits/Timestamps.php b/src/Traits/Timestamps.php
diff --git a/tests/Configuration/DriverMapperTest.php b/tests/Configuration/DriverMapperTest.php
diff --git a/tests/Configuration/SqlMapperTest.php b/tests/Configuration/SqlMapperTest.php
diff --git a/tests/Configuration/SqliteMapperTest.php b/tests/Configuration/SqliteMapperTest.php
diff --git a/tests/Stubs/ApplicationStub.php b/tests/Stubs/ApplicationStub.php

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<?php namespace Mitch\LaravelDoctrine\CacheProviders;`
	`1`	`+<?php namespace Mitch\LaravelDoctrine\Cache;`
`2`	`2`
`3`	`3`	`use Doctrine\Common\Cache\ApcCache;`
`4`	`4`