Merge pull request #475 from alcaeus/odm-2.0-support

Prepare bundle for ODM 2.0

Author: alcaeus

.travis.yml

@@ -2,21 +2,19 @@ language: php
 sudo: false
 
 php:
-  - 5.6
-  - 7.0
-  - 7.1
   - 7.2
 
 env:
   global:
     - DRIVER_VERSION="stable"
-    - ADAPTER_VERSION="^1.0.0"
     - COMPOSER_FLAGS="--prefer-dist"
 
 matrix:
   include:
-    - php: 5.6
-      env: DRIVER_VERSION="1.5.8" COMPOSER_FLAGS="--prefer-dist --prefer-lowest" PHPUNIT_FLAGS="--coverage-clover=coverage.clover"
+    - php: 7.2
+      env: DRIVER_VERSION="stable" COMPOSER_FLAGS="--prefer-dist"
+    - php: 7.2
+      env: DRIVER_VERSION="1.5.0" COMPOSER_FLAGS="--prefer-dist --prefer-lowest" PHPUNIT_FLAGS="--coverage-clover=coverage.clover"
 
 cache:
   directories:
@@ -26,9 +24,7 @@ services: mongodb
 
 install:
   - composer self-update
-  - if [[ ${TRAVIS_PHP_VERSION:0:2} == "5." ]]; then yes '' | pecl -q install -f mongo-${DRIVER_VERSION}; fi
-  - if [[ ${TRAVIS_PHP_VERSION:0:2} == "7." ]]; then pecl install -f mongodb-${DRIVER_VERSION}; fi
-  - if [[ ${TRAVIS_PHP_VERSION:0:2} == "7." ]]; then composer config "platform.ext-mongo" "1.6.16" && composer require "alcaeus/mongo-php-adapter=${ADAPTER_VERSION}"; fi
+  - pecl install -f mongodb-${DRIVER_VERSION}
   - composer update ${COMPOSER_FLAGS}
 
 script:

APM/PSRCommandLogger.php

@@ -0,0 +1,69 @@
+<?php
+
+declare(strict_types = 1);
+
+namespace Doctrine\Bundle\MongoDBBundle\APM;
+
+use MongoDB\Driver\Monitoring\CommandFailedEvent;
+use MongoDB\Driver\Monitoring\CommandStartedEvent;
+use MongoDB\Driver\Monitoring\CommandSubscriber;
+use MongoDB\Driver\Monitoring\CommandSucceededEvent;
+use Psr\Log\LoggerInterface;
+use function json_encode;
+use function MongoDB\Driver\Monitoring\addSubscriber;
+use function MongoDB\Driver\Monitoring\removeSubscriber;
+
+final class PSRCommandLogger implements CommandSubscriber
+{
+    /** @var bool */
+    private $registered = false;
+
+    /** @var LoggerInterface|null */
+    private $logger;
+
+    /** @var string */
+    private $prefix;
+
+    public function __construct(?LoggerInterface $logger, string $prefix = 'MongoDB command: ')
+    {
+        $this->logger = $logger;
+        $this->prefix = $prefix;
+    }
+
+    public function register(): void
+    {
+        if ($this->logger === null || $this->registered) {
+            return;
+        }
+
+        $this->registered = true;
+        addSubscriber($this);
+    }
+
+    public function unregister(): void
+    {
+        if (! $this->registered) {
+            return;
+        }
+
+        removeSubscriber($this);
+        $this->registered = false;
+    }
+
+    public function commandStarted(CommandStartedEvent $event)
+    {
+        if (!$this->logger) {
+            return;
+        }
+
+        $this->logger->debug($this->prefix . json_encode($event->getCommand()));
+    }
+
+    public function commandSucceeded(CommandSucceededEvent $event)
+    {
+    }
+
+    public function commandFailed(CommandFailedEvent $event)
+    {
+    }
+}

Command/InfoDoctrineODMCommand.php

@@ -52,7 +52,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 'You do not have any mapped Doctrine MongoDB ODM documents for any of your bundles. '.
                 'Create a class inside the Document namespace of any of your bundles and provide '.
                 'mapping information for it with Annotations directly in the classes doc blocks '.
-                'or with XML/YAML in your bundles Resources/config/doctrine/metadata/mongodb directory.'
+                'or with XML in your bundles Resources/config/doctrine/metadata/mongodb directory.'
             );
         }
 

DataCollector/CommandDataCollector.php

@@ -0,0 +1,59 @@
+<?php
+
+namespace Doctrine\Bundle\MongoDBBundle\DataCollector;
+
+use Doctrine\ODM\MongoDB\APM\Command;
+use Doctrine\ODM\MongoDB\APM\CommandLogger;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\DataCollector\DataCollector;
+
+class CommandDataCollector extends DataCollector
+{
+    private $commandLogger;
+
+    public function __construct(CommandLogger $commandLogger)
+    {
+        $this->commandLogger = $commandLogger;
+    }
+
+    public function collect(Request $request, Response $response, \Exception $exception = null)
+    {
+        $this->data = [
+            'num_commands' => count($this->commandLogger),
+            'commands' => array_map(
+                function (Command $command): string {
+                    return json_encode($command->getCommand());
+                },
+                $this->commandLogger->getAll()
+            ),
+        ];
+    }
+
+    public function reset()
+    {
+        $this->commandLogger->clear();
+        $this->data = [
+            'num_commands' => 0,
+            'commands' => [],
+        ];
+    }
+
+    public function getCommandCount(): int
+    {
+        return $this->data['num_commands'];
+    }
+
+    /**
+     * @return string[]
+     */
+    public function getCommands(): array
+    {
+        return $this->data['commands'];
+    }
+
+    public function getName()
+    {
+        return 'mongodb';
+    }
+}