1.0.0

.gitignore

@@ -4,5 +4,8 @@ composer.lock
 .DS_Store
 .php_cs.cache
 
+/tests/Stubs/storage/framework/views/*
+!/tests/Stubs/storage/framework/views/.gitkeep
+/tests/Stubs/storage/doctrine.generated.php
 .idea
 laravel-doctrine-orm.iml

.php_cs

@@ -8,7 +8,7 @@ return Symfony\CS\Config\Config::create()
     ->setUsingCache(true)
     ->level(Symfony\CS\FixerInterface::PSR2_LEVEL)
     ->fixers(array(
-        'psr0',
+        'psr4',
         'encoding',
         'short_tag',
         'blankline_after_open_tag',

.travis.yml

@@ -3,6 +3,8 @@ language: php
 php:
   - 5.5
   - 5.6
+  - 7.0
+  - hhvm
 
 before_script:
   - travis_retry composer self-update
@@ -12,6 +14,8 @@ after_script:
   - wget https://scrutinizer-ci.com/ocular.phar
   - php ocular.phar code-coverage:upload --format=php-clover coverage.clover
 
+sudo: false
+
 script: phpunit --coverage-clover=coverage.clover
 
 matrix:

README.md

@@ -2,12 +2,12 @@
 
 <img src="https://cloud.githubusercontent.com/assets/7728097/9831648/1827b704-5960-11e5-982d-98c8fc8dcacd.jpg"/>
 
-[![GitHub release](https://img.shields.io/github/release/laravel-doctrine/orm.svg?style=flat)](https://packagist.org/packages/laravel-doctrine/orm)
-[![Travis](https://img.shields.io/travis/laravel-doctrine/orm.svg?style=flat)](https://travis-ci.org/laravel-doctrine/orm)
-[![Scrutinizer](https://img.shields.io/scrutinizer/g/laravel-doctrine/orm.svg?style=flat)](https://github.com/laravel-doctrine/orm)
-[![Packagist](https://img.shields.io/packagist/dd/laravel-doctrine/orm.svg?style=flat)](https://packagist.org/packages/laravel-doctrine/orm)
-[![Packagist](https://img.shields.io/packagist/dm/laravel-doctrine/orm.svg?style=flat)](https://packagist.org/packages/laravel-doctrine/orm)
-[![Packagist](https://img.shields.io/packagist/dt/laravel-doctrine/orm.svg?style=flat)](https://packagist.org/packages/laravel-doctrine/orm)
+[![GitHub release](https://img.shields.io/github/release/laravel-doctrine/orm.svg?style=flat-square)](https://packagist.org/packages/laravel-doctrine/orm)
+[![Travis](https://img.shields.io/travis/laravel-doctrine/orm.svg?style=flat-square)](https://travis-ci.org/laravel-doctrine/orm)
+[![StyleCI](https://styleci.io/repos/39036008/shield)](https://styleci.io/repos/39036008)
+[![Scrutinizer](https://img.shields.io/scrutinizer/g/laravel-doctrine/orm.svg?style=flat-square)](https://github.com/laravel-doctrine/orm)
+[![Packagist](https://img.shields.io/packagist/dm/laravel-doctrine/orm.svg?style=flat-square)](https://packagist.org/packages/laravel-doctrine/orm)
+[![Packagist](https://img.shields.io/packagist/dt/laravel-doctrine/orm.svg?style=flat-square)](https://packagist.org/packages/laravel-doctrine/orm)
 
 *A drop-in Doctrine ORM 2 implementation for Laravel 5+*
 
@@ -53,13 +53,13 @@ Require this package
 After adding the package, add the ServiceProvider to the providers array in `config/app.php`
 
 ```php
-'LaravelDoctrine\ORM\DoctrineServiceProvider',
+LaravelDoctrine\ORM\DoctrineServiceProvider::class,
 ```
 
 Optionally you can register the EntityManager facade:
 
 ```php
-'EntityManager' => 'LaravelDoctrine\ORM\Facades\EntityManager'
+'EntityManager' => LaravelDoctrine\ORM\Facades\EntityManager::class
 ```
 
 To publish the config use:

composer.json

@@ -26,7 +26,8 @@
     "illuminate/pagination": "~5.1",
     "illuminate/support": "~5.1",
     "illuminate/validation": "~5.1",
-    "illuminate/view": "~5.1"
+    "illuminate/view": "~5.1",
+    "symfony/serializer": "^2.7"
   },
   "require-dev": {
     "phpunit/phpunit": "~4.0",
@@ -46,6 +47,9 @@
     ]
   },
   "suggest": {
+    "laravel-doctrine/acl": "to integrate Doctrine roles & permissions with Laravel's Authorization system (~1.0)",
+    "laravel-doctrine/extensions": "to add Behavioral and Query/Type Extensions for Laravel Doctrine (~1.0)",
+    "laravel-doctrine/migrations": "to add support for migrations in Laravel Doctrine (~1.0)",
     "yajra/laravel-oci8": "Support for Laravel native queue and session database drivers in Oracle (~2.0)."
   }
 }

src/Auth/Authenticatable.php

@@ -14,6 +14,15 @@ trait Authenticatable
      */
     protected $rememberToken;
 
+    /**
+     * Get the column name for the primary key
+     * @return string
+     */
+    public function getAuthIdentifierName()
+    {
+        return 'id';
+    }
+
     /**
      * Get the unique identifier for the user.
      * @return mixed
@@ -25,15 +34,6 @@ public function getAuthIdentifier()
         return $this->{$name};
     }
 
-    /**
-     * Get the column name for the primary key
-     * @return string
-     */
-    public function getAuthIdentifierName()
-    {
-        return 'id';
-    }
-
     /**
      * @return string
      */

src/Auth/Passwords/PasswordResetServiceProvider.php

@@ -72,7 +72,7 @@ protected function registerTokenRepository()
             return new DoctrineTokenRepository(
                 $this->app->make(ManagerRegistry::class)->getManagerForClass(PasswordReminder::class),
                 $app['config']['app.key'],
-                $app['config']->get('auth.reminder.expire', 60)
+                $app['config']->get('auth.password.expire', 60)
             );
         });
     }

src/Console/ConfigMigrations/AtrauzziMigrator.php

@@ -0,0 +1,182 @@
+<?php
+
+namespace LaravelDoctrine\ORM\Console\ConfigMigrations;
+
+use Illuminate\Contracts\View\Factory;
+use LaravelDoctrine\ORM\Utilities\ArrayUtil;
+
+class AtrauzziMigrator implements ConfigurationMigrator
+{
+    /**
+     * @var Factory
+     */
+    protected $viewFactory;
+
+    /**
+     * @param Factory $viewFactory
+     */
+    public function __construct(Factory $viewFactory)
+    {
+        $this->viewFactory = $viewFactory;
+        $this->viewFactory->addNamespace('atrauzzi', realpath(__DIR__ . '/templates/atrauzzi'));
+        $this->viewFactory->addNamespace('laraveldoctrine', realpath(__DIR__ . '/templates/laraveldoctrine'));
+    }
+
+    /**
+     * Convert a configuration array from another laravel-doctrine project in to a string representation of a php array configuration for this project
+     *
+     * @param array $sourceArray
+     *
+     * @return string
+     */
+    public function convertConfiguration($sourceArray)
+    {
+        $dqls        = $this->convertDQL($sourceArray);
+        $cache       = $this->convertCache($sourceArray);
+        $customTypes = $this->convertCustomTypes($sourceArray);
+        $managers    = [$this->convertManager($sourceArray)];
+
+        $results = $this->viewFactory->make('laraveldoctrine.master', [
+            'managers'    => $managers,
+            'cache'       => $cache,
+            'dqls'        => $dqls,
+            'customTypes' => $customTypes
+        ])->render();
+
+        return $this->unescape($results);
+    }
+
+    /**
+     * @param $sourceArray
+     *
+     * @return string
+     */
+    public function convertManager($sourceArray)
+    {
+        $proxySettings = ArrayUtil::get($sourceArray['proxy_classes']);
+        $defaultRepo   = ArrayUtil::get($sourceArray['default_repository']);
+        $namespaces    = [];
+        $connection    = ArrayUtil::get($sourceArray['default']);
+
+        // Non default configuration
+        if (count($sourceArray['metadata']) > 1) {
+            $hasNamespaces = false;
+            $driver        = null;
+            $sameDriver    = true;
+
+            foreach ($sourceArray['metadata'] as $key => $item) {
+                if (is_null($driver)) {
+                    if (is_array($item)) {
+                        $driver = $item['driver'];
+                    } elseif ($key == 'driver') {
+                        $driver = $item;
+                    }
+                } else {
+                    if (is_array($item) && $item['driver'] != $driver) {
+                        $sameDriver = false;
+                    }
+                }
+                if (is_array($item) && isset($item['namespace'])) {
+                    $hasNamespaces = true;
+                }
+            }
+            // Only do this if all the same driver
+            if ($hasNamespaces && $sameDriver) {
+                $driver = $sourceArray['metadata'][0]['driver'];
+
+                // Convert each metadata entry into a namespace entry
+                foreach ($sourceArray['metadata'] as $item) {
+                    if (isset($item['alias'])) {
+                        $namespaces[$item['alias']] = $item['namespace'];
+                    } else {
+                        array_push($namespaces, $item['namespace']);
+                    }
+                }
+                // Only specifying one non-default EM
+            } else {
+                if (isset($sourceArray['metadata']['namespace'])) {
+                    if (isset($sourceArray['metadata']['alias'])) {
+                        $namespaces[$sourceArray['metadata']['alias']] = $sourceArray['metadata']['namespace'];
+                    } else {
+                        $namespaces[] = $sourceArray['metadata']['namespace'];
+                    }
+                }
+            }
+            // One EM, default
+        } else {
+            $driver = $sourceArray['metadata']['driver'];
+        }
+
+        $results = $this->viewFactory->make('atrauzzi.manager', [
+            'namespaces'    => $namespaces,
+            'proxySettings' => $proxySettings,
+            'defaultRepo'   => $defaultRepo,
+            'driver'        => $driver,
+            'connection'    => $connection
+        ])->render();
+
+        return $this->unescape($results);
+    }
+
+    /**
+     * @param $sourceArray
+     *
+     * @return string
+     */
+    public function convertCustomTypes($sourceArray)
+    {
+        $results = $this->viewFactory->make('atrauzzi.customTypes', [
+            'sourceArray' => $sourceArray
+        ])->render();
+
+        return $this->unescape($results);
+    }
+
+    /**
+     * Convert a cache section from mitchellvanw/laravel-doctrine to a string representation of a php array configuration for a cache section for this project
+     *
+     * @param array $sourceArray
+     *
+     * @return string
+     */
+    public function convertCache($sourceArray)
+    {
+        if (isset($sourceArray['cache']['provider'])) {
+            $cacheProvider = ArrayUtil::get($sourceArray['cache']['provider']);
+            $results       = $this->viewFactory->make('atrauzzi.cache', [
+                'cacheProvider' => $cacheProvider,
+                'extras'        => count($sourceArray['cache']) > 1
+                //if user is mimicking cache arrays here we need to tell them to move these to cache.php
+            ])->render();
+
+            return $this->unescape($results);
+        }
+
+        return null;
+    }
+
+    /**
+     * Convert the dql sections from the entity managers in a configuration from atruazzi/laravel-doctrine into a string representation of a php array configuration for custom string/numeric/datetime functions
+     * Returns null if no dql sections were found.
+     *
+     * @param $sourceArray
+     *
+     * @return null|string
+     */
+    public function convertDQL($sourceArray)
+    {
+        $results = $this->viewFactory->make('atrauzzi.dql', ['dql' => $sourceArray])->render();
+
+        return $this->unescape($results);
+    }
+
+    /**
+     * @param $results
+     *
+     * @return string
+     */
+    protected function unescape($results)
+    {
+        return html_entity_decode($results, ENT_QUOTES);
+    }
+}

src/Console/ConfigMigrations/ConfigurationMigrator.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace LaravelDoctrine\ORM\ConfigMigrations;
+namespace LaravelDoctrine\ORM\Console\ConfigMigrations;
 
 use Illuminate\Contracts\View\Factory;