Update tools/sandbox for Composer vendors

Author: jmikola

tools/sandbox/Documents/Account.php

@@ -37,4 +37,4 @@ public function __toString()
     {
         return $this->name;
     }
-}
+}

tools/sandbox/Documents/Address.php

@@ -58,4 +58,4 @@ public function setPostalCode($postalCode)
     {
         $this->postalCode = $postalCode;
     }
-}
+}

tools/sandbox/Documents/Phonenumber.php

@@ -29,4 +29,4 @@ public function __toString()
     {
         return $this->phonenumber;
     }
-}
+}

tools/sandbox/Documents/User.php

@@ -84,4 +84,4 @@ public function __toString()
     {
         return $this->username;
     }
-}
+}

tools/sandbox/UserRepository.php

@@ -12,4 +12,4 @@
  */
 class serRepository extends DocumentRepository
 {
-}
+}

tools/sandbox/cli-config.php

@@ -1,7 +1,7 @@
 <?php
 
+use Doctrine\ODM\MongoDB\Tools\Console\Helper\DocumentManagerHelper;
+
 require_once 'config.php';
 
-$helpers = array(
-    'dm' => new Doctrine\ODM\MongoDB\Tools\Console\Helper\DocumentManagerHelper($dm),
-);
+$helpers = array(new DocumentManagerHelper($dm));

tools/sandbox/config.php

@@ -1,25 +1,20 @@
 <?php
 
-require_once __DIR__ . '/../../lib/vendor/doctrine-common/lib/Doctrine/Common/ClassLoader.php';
+use Doctrine\Common\ClassLoader;
+use Doctrine\Common\Annotations\AnnotationReader;
+use Doctrine\MongoDB\Connection;
+use Doctrine\ODM\MongoDB\Configuration;
+use Doctrine\ODM\MongoDB\DocumentManager;
+use Doctrine\ODM\MongoDB\Mapping\Driver\AnnotationDriver;
 
-use Doctrine\Common\ClassLoader,
-    Doctrine\Common\Annotations\AnnotationReader,
-    Doctrine\ODM\MongoDB\Configuration,
-    Doctrine\ODM\MongoDB\Mapping\Driver\AnnotationDriver,
-    Doctrine\MongoDB\Connection,
-    Doctrine\ODM\MongoDB\DocumentManager;
+$file = __DIR__.'/../../vendor/autoload.php';
+if (!file_exists($file)) {
+    throw new RuntimeException('Install dependencies to run the sandbox.');
+}
 
-$classLoader = new ClassLoader('Doctrine\Common', __DIR__ . '/../../lib/vendor/doctrine-common/lib');
-$classLoader->register();
-
-$classLoader = new ClassLoader('Doctrine\ODM\MongoDB', __DIR__ . '/../../lib');
-$classLoader->register();
+require_once $file;
 
-$classLoader = new ClassLoader('Doctrine\MongoDB', __DIR__ . '/../../lib/vendor/doctrine-mongodb/lib');
-$classLoader->register();
-
-$classLoader = new ClassLoader('Symfony', __DIR__ . '/../../lib/vendor');
-$classLoader->register();
+AnnotationDriver::registerAnnotationClasses();
 
 $classLoader = new ClassLoader('Documents', __DIR__);
 $classLoader->register();
@@ -34,14 +29,9 @@
 
 $config->setDefaultDB('doctrine_odm_sandbox');
 
-/*
-$config->setLoggerCallable(function(array $log) {
-    print_r($log);
-});
-$config->setMetadataCacheImpl(new ApcCache());
-*/
+// $config->setLoggerCallable(function(array $log) { print_r($log); });
+// $config->setMetadataCacheImpl(new ApcCache());
 
-$reader = new AnnotationReader();
-$config->setMetadataDriverImpl(new AnnotationDriver($reader, __DIR__ . '/Documents'));
+$config->setMetadataDriverImpl(new AnnotationDriver(new AnnotationReader(), __DIR__ . '/Documents'));
 
-$dm = DocumentManager::create(new Connection(), $config);
+$dm = DocumentManager::create(new Connection(), $config);

tools/sandbox/index.php

@@ -2,9 +2,9 @@
 
 require_once 'config.php';
 
-use Documents\User,
-    Documents\Address,
-    Documents\Phonenumber,
-    Documents\Account;
+use Documents\User;
+use Documents\Address;
+use Documents\Phonenumber;
+use Documents\Account;
 
-// Your code here...
+// Your code here...

tools/sandbox/mongodb

@@ -1,4 +1,4 @@
 #!/usr/bin/env php
 <?php
 
-include('mongodb.php');
+include('mongodb.php');

tools/sandbox/mongodb.php

@@ -1,13 +1,16 @@
 <?php
 
+use Symfony\Component\Console\Application;
+use Symfony\Component\Console\Helper\HelperSet;
+
 require __DIR__ . DIRECTORY_SEPARATOR . 'cli-config.php';
 
-$helperSet = isset($helperSet) ? $helperSet : new \Symfony\Component\Console\Helper\HelperSet();
+$helperSet = isset($helperSet) ? $helperSet : new HelperSet();
 foreach ($helpers as $name => $helper) {
     $helperSet->set($helper, $name);
 }
 
-$cli = new \Symfony\Component\Console\Application('Doctrine ODM MongoDB Command Line Interface', Doctrine\ODM\MongoDB\Version::VERSION);
+$cli = new Application('Doctrine ODM MongoDB Command Line Interface', Doctrine\ODM\MongoDB\Version::VERSION);
 $cli->setCatchExceptions(true);
 $cli->setHelperSet($helperSet);
 $cli->addCommands(array(
@@ -19,4 +22,4 @@
     new \Doctrine\ODM\MongoDB\Tools\Console\Command\Schema\CreateCommand(),
     new \Doctrine\ODM\MongoDB\Tools\Console\Command\Schema\DropCommand(),
 ));
-$cli->run();
+$cli->run();