Merge pull request propelorm#384 from havvg/1.5

integrate former Symfony Propel1 bridge

Author: havvg

DataCollector/PropelDataCollector.php

@@ -0,0 +1,147 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Propel\PropelBundle\DataCollector;
+
+use Propel\PropelBundle\Logger\PropelLogger;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\DataCollector\DataCollector;
+
+/**
+ * The PropelDataCollector collector class collects information.
+ *
+ * @author William Durand <william.durand1@gmail.com>
+ */
+class PropelDataCollector extends DataCollector
+{
+    /**
+     * Propel logger.
+     *
+     * @var PropelLogger
+     */
+    private $logger;
+
+    /**
+     * Propel configuration.
+     *
+     * @var \PropelConfiguration
+     */
+    protected $propelConfiguration;
+
+    /**
+     * Constructor.
+     *
+     * @param PropelLogger         $logger              A Propel logger.
+     * @param \PropelConfiguration $propelConfiguration The Propel configuration object.
+     */
+    public function __construct(PropelLogger $logger, \PropelConfiguration $propelConfiguration)
+    {
+        $this->logger = $logger;
+        $this->propelConfiguration = $propelConfiguration;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function collect(Request $request, Response $response, \Exception $exception = null)
+    {
+        $this->data = array(
+            'queries' => $this->buildQueries(),
+            'querycount' => $this->countQueries(),
+        );
+    }
+
+    /**
+     * Returns the collector name.
+     *
+     * @return string
+     */
+    public function getName()
+    {
+        return 'propel';
+    }
+
+    /**
+     * Returns the collected stats for all executed SQL queries.
+     *
+     * @return array
+     */
+    public function getQueries()
+    {
+        return $this->data['queries'];
+    }
+
+    /**
+     * Returns the query count.
+     *
+     * @return int
+     */
+    public function getQueryCount()
+    {
+        return $this->data['querycount'];
+    }
+
+    /**
+     * Returns the total time spent on running all queries.
+     *
+     * @return float
+     */
+    public function getTime()
+    {
+        $time = 0;
+        foreach ($this->data['queries'] as $query) {
+            $time += (float) $query['time'];
+        }
+
+        return $time;
+    }
+
+    /**
+     * Computes the stats of all executed SQL queries.
+     *
+     * @return array
+     */
+    private function buildQueries()
+    {
+        $queries = array();
+
+        $outerGlue = $this->propelConfiguration->getParameter('debugpdo.logging.outerglue', ' | ');
+        $innerGlue = $this->propelConfiguration->getParameter('debugpdo.logging.innerglue', ': ');
+
+        foreach ($this->logger->getQueries() as $q) {
+            $parts = explode($outerGlue, $q, 4);
+
+            $times = explode($innerGlue, $parts[0]);
+            $con = explode($innerGlue, $parts[2]);
+            $memories = explode($innerGlue, $parts[1]);
+
+            $sql = trim($parts[3]);
+            $con = trim($con[1]);
+            $time = trim($times[1]);
+            $memory = trim($memories[1]);
+
+            $queries[] = array('connection' => $con, 'sql' => $sql, 'time' => $time, 'memory' => $memory);
+        }
+
+        return $queries;
+    }
+
+    /**
+     * Returns the total count of SQL queries.
+     *
+     * @return int
+     */
+    private function countQueries()
+    {
+        return count($this->logger->getQueries());
+    }
+}

DependencyInjection/Security/UserProvider/PropelFactory.php

@@ -0,0 +1,69 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Propel\PropelBundle\DependencyInjection\Security\UserProvider;
+
+use Symfony\Bundle\SecurityBundle\DependencyInjection\Security\UserProvider\UserProviderFactoryInterface;
+use Symfony\Component\Config\Definition\Builder\NodeDefinition;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\DefinitionDecorator;
+
+/**
+ * PropelFactory creates services for Propel user provider.
+ *
+ * @author William Durand <william.durand1@gmail.com>
+ */
+class PropelFactory implements UserProviderFactoryInterface
+{
+    private $key;
+    private $providerId;
+
+    /**
+     * Constructor.
+     *
+     * @param string $key
+     * @param string $providerId
+     */
+    public function __construct($key, $providerId)
+    {
+        $this->key = $key;
+        $this->providerId = $providerId;
+    }
+
+    public function create(ContainerBuilder $container, $id, $config)
+    {
+        $container
+            ->setDefinition($id, new DefinitionDecorator($this->providerId))
+            ->addArgument($config['class'])
+            ->addArgument($config['property'])
+        ;
+    }
+
+    public function getKey()
+    {
+        return $this->key;
+    }
+
+    public function addConfiguration(NodeDefinition $node)
+    {
+        $node
+            ->children()
+                ->scalarNode('class')
+                    ->isRequired()
+                    ->cannotBeEmpty()
+                ->end()
+                ->scalarNode('property')
+                    ->defaultNull()
+                ->end()
+            ->end()
+        ;
+    }
+}