Allows for schema to be specified in application, rather than bundle.

Author: jonesiscoding

Command/AbstractCommand.php

@@ -16,6 +16,7 @@
 use Symfony\Component\Finder\Finder;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 use Symfony\Component\HttpKernel\Bundle\BundleInterface;
+use Symfony\Component\HttpKernel\Kernel;
 use Symfony\Component\HttpKernel\KernelInterface;
 
 /**
@@ -65,6 +66,24 @@ abstract class AbstractCommand extends ContainerAwareCommand
      */
     protected $input;
 
+    /**
+     * @param string $namespace
+     *
+     * @return string
+     */
+    protected function getPackageFromApp($namespace)
+    {
+      if ('\\' === $namespace[0]) {
+        $namespace = substr($namespace, 1);
+      }
+
+      if (0 === stripos($namespace, 'App\\')) {
+        $namespace = substr($namespace, 4);
+      }
+
+      return 'src.'.str_replace('\\', '.', $namespace);
+    }
+
     /**
      * Return the package for a given bundle.
      *
@@ -235,9 +254,14 @@ protected function copySchemas(KernelInterface $kernel, $cacheDir)
         foreach ($finalSchemas as $schema) {
             list($bundle, $finalSchema) = $schema;
 
-            $tempSchema = $bundle->getName().'-'.$finalSchema->getBaseName();
+            if ($bundle) {
+              $tempSchema = $bundle->getName().'-'.$finalSchema->getBaseName();
+            } else {
+              $tempSchema = 'app-' . $finalSchema->getBaseName();
+            }
+
             $this->tempSchemas[$tempSchema] = array(
-                'bundle'    => $bundle->getName(),
+                'bundle'    => ($bundle) ? $bundle->getName() : 'app',
                 'basename'  => $finalSchema->getBaseName(),
                 'path'      => $finalSchema->getPathname(),
             );
@@ -255,16 +279,18 @@ protected function copySchemas(KernelInterface $kernel, $cacheDir)
                 // This is used to override the package resulting from namespace conversion.
                 $package = $database['package'];
             } elseif (isset($database['namespace'])) {
-                $package = $this->getPackage($bundle, $database['namespace'], $base);
+                if ($bundle) {
+                  $database['package'] = $this->getPackage($bundle, (string)$database['namespace'], $base);
+                } else {
+                  $database['package'] = $this->getPackageFromApp((string)$database['namespace']);
+                }
             } else {
                 throw new \RuntimeException(
                     sprintf('%s : Please define a `package` attribute or a `namespace` attribute for schema `%s`',
                         $bundle->getName(), $finalSchema->getBaseName())
                 );
             }
 
-            $database['package'] = $package;
-
             if ($this->input && $this->input->hasOption('connection') && $this->input->getOption('connection')
                 && $database['name'] != $this->input->getOption('connection')) {
                 //we skip this schema because the connection name doesn't match the input value
@@ -277,7 +303,7 @@ protected function copySchemas(KernelInterface $kernel, $cacheDir)
                 if (isset($table['package'])) {
                     $table['package'] = $table['package'];
                 } else {
-                    $table['package'] = $package;
+                    $table['package'] = $database['package'];
                 }
             }
 
@@ -303,9 +329,26 @@ protected function getFinalSchemas(KernelInterface $kernel, BundleInterface $bun
             $finalSchemas = array_merge($finalSchemas, $this->getSchemasFromBundle($bundle));
         }
 
+        $finalSchemas = array_merge($finalSchemas, $this->getSchemasFromConfiguration());
+
         return $finalSchemas;
     }
 
+  protected function getSchemasFromConfiguration()
+  {
+    $schemas = [];
+    if (is_dir($dir = $this->getContainer()->getParameter('propel.schema.path')))
+    {
+      $path = $dir . DIRECTORY_SEPARATOR . 'schema.xml';
+      if (is_file($path)) {
+        $schema = new \SplFileInfo($path);
+        $schemas[(string) $schema] = array(null, $schema);
+      }
+    }
+
+    return $schemas;
+  }
+
     /**
      * @param \Symfony\Component\HttpKernel\Bundle\BundleInterface $bundle
      *
@@ -462,6 +505,11 @@ protected function getCacheDir()
         return $this->cacheDir;
     }
 
+    protected function getProjectDir()
+    {
+      return $this->getContainer()->getParameter('kernel.project_dir');
+    }
+
     /**
      * @return \Symfony\Component\Config\FileLocatorInterface
      */
@@ -647,12 +695,22 @@ private function getPhingArguments(KernelInterface $kernel, $workingDirectory, $
     {
         $args = array();
 
+        $projectDir = $this->getProjectDir();
+        if ($kernel instanceof Kernel)
+        {
+          $output = ($kernel::MAJOR_VERSION > 3) ? $projectDir.'/var/propel' : $projectDir.'/app/propel';
+        }
+        else
+        {
+          $output = is_dir($projectDir.'/var') ? $projectDir.'/var/propel' : $projectDir.'/app/propel';
+        }
+
         // Default properties
         $properties = array_merge(array(
             'propel.database'           => 'mysql',
             'project.dir'               => $workingDirectory,
-            'propel.output.dir'         => $kernel->getProjectDir().'/propel',
-            'propel.php.dir'            => $kernel->getProjectDir(),
+            'propel.output.dir'         => $output,
+            'propel.php.dir'            => $projectDir,
             'propel.packageObjectModel' => true,
             'propel.useDateTimeClass'   => true,
             'propel.dateTimeClass'      => 'DateTime',

DependencyInjection/Configuration.php

@@ -70,6 +70,7 @@ private function addGeneralSection(ArrayNodeDefinition $node)
         $node
             ->children()
                 ->scalarNode('path')->end()
+                ->scalarNode('schema_path')->end()
                 ->scalarNode('phing_path')->end()
                 ->scalarNode('logging')->defaultValue($this->debug)->end()
                 ->arrayNode('build_properties')

DependencyInjection/PropelExtension.php

@@ -62,6 +62,11 @@ public function load(array $configs, ContainerBuilder $container)
 
         $container->setParameter('propel.logging', $logging);
 
+        if (!empty($config['schema_path']))
+        {
+          $container->setParameter('propel.schema.path', $config['schema_path']);
+        }
+
         // Load services
         if (!$container->hasDefinition('propel')) {
             $loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));