doctrine / orm

tools/sandbox/index.php

Spacing +2 added lines, -2 removed lines

@@ -12,11 +12,11 @@
 use Entities\Address;
 use Entities\User;
 
-$em = require_once __DIR__ . '/bootstrap.php';
+$em = require_once __DIR__.'/bootstrap.php';
 
 ## PUT YOUR TEST CODE BELOW
 
 $user = new User;
 $address = new Address;
 
-echo 'Hello World!' . PHP_EOL;
+echo 'Hello World!'.PHP_EOL;

tools/sandbox/bootstrap.php

Spacing +4 added lines, -4 removed lines

@@ -5,8 +5,8 @@ 
 
 // Path to composer autoloader. You can use different provided by your favorite framework,
 // if you want to.
-$loaderPath = __DIR__ . '/../../vendor/autoload.php';
-if(!is_readable($loaderPath)){
+$loaderPath = __DIR__.'/../../vendor/autoload.php';
+if ( ! is_readable($loaderPath)) {
     throw new LogicException('Run php composer.phar install at first');
 }
 $loader = require $loaderPath;
@@ -19,7 +19,7 @@ 
 $config = new \Doctrine\ORM\Configuration();
 
 // Set up Metadata Drivers
-$driverImpl = $config->newDefaultAnnotationDriver(array(__DIR__ . "/Entities"));
+$driverImpl = $config->newDefaultAnnotationDriver(array(__DIR__."/Entities"));
 $config->setMetadataDriverImpl($driverImpl);
 
 // Set up caches, depending on $debug variable.
@@ -29,7 +29,7 @@ 
 $config->setQueryCacheImpl($cache);
 
 // Proxy configuration
-$config->setProxyDir(__DIR__ . '/Proxies');
+$config->setProxyDir(__DIR__.'/Proxies');
 $config->setProxyNamespace('Proxies');
 
 // Database connection information

lib/Shitty/ORM/AbstractQuery.php

Unused Use Statements -3 removed lines

@@ -22,13 +22,10 @@
 use Shitty\Common\Util\ClassUtils;
 use Shitty\Common\Collections\Collection;
 use Shitty\Common\Collections\ArrayCollection;
-
 use Shitty\ORM\Query\Parameter;
 use Shitty\ORM\Cache\QueryCacheKey;
 use Shitty\DBAL\Cache\QueryCacheProfile;
-
 use Shitty\ORM\Cache;
-use Shitty\ORM\Query\QueryException;
 
 /**
  * Base contract for ORM queries. Base class for Query and NativeQuery.

Indentation +4 added lines, -4 removed lines

@@ -212,10 +212,10 @@
     }
 
     /**
-    * Obtain the name of the second level query cache region in which query results will be stored
-    *
-    * @return string|null The cache region name; NULL indicates the default region.
-    */
+     * Obtain the name of the second level query cache region in which query results will be stored
+     *
+     * @return string|null The cache region name; NULL indicates the default region.
+     */
     public function getCacheRegion()
     {
         return $this->cacheRegion;

Spacing +4 added lines, -4 removed lines

@@ -324,7 +324,7 @@ 
     public function getParameter($key)
     {
         $filteredParameters = $this->parameters->filter(
-            function ($parameter) use ($key)
+            function($parameter) use ($key)
             {
                 // Must not be identical because of string to integer conversion
                 return ($key == $parameter->getName());
@@ -373,7 +373,7 @@ 
     public function setParameter($key, $value, $type = null)
     {
         $filteredParameters = $this->parameters->filter(
-            function ($parameter) use ($key)
+            function($parameter) use ($key)
             {
                 // Must not be identical because of string to integer conversion
                 return ($key == $parameter->getName());
@@ -469,7 +469,7 @@ 
      */
     private function translateNamespaces(Query\ResultSetMapping $rsm)
     {
-        $translate = function ($alias) {
+        $translate = function($alias) {
             return $this->_em->getClassMetadata($alias)->getName();
         };
 
@@ -1114,6 +1114,6 @@ 
 
         ksort($hints);
 
-        return sha1($query . '-' . serialize($params) . '-' . serialize($hints));
+        return sha1($query.'-'.serialize($params).'-'.serialize($hints));
     }
 }

lib/Shitty/ORM/Cache/Persister/Entity/AbstractEntityPersister.php

Doc Comments +1 added lines, -1 removed lines

@@ -282,7 +282,7 @@
     /**
      * Generates a string of currently query
      *
-     * @param array   $query
+     * @param string   $query
      * @param string  $criteria
      * @param array   $orderBy
      * @param integer $limit

Unused Use Statements -1 removed lines

@@ -21,7 +21,6 @@
 
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Criteria;
-
 use Doctrine\ORM\Query\Expr;
 use Doctrine\ORM\Query\QueryExpressionVisitor;
 

Indentation +6 added lines, -6 removed lines

@@ -41,9 +41,9 @@ 
  */
 abstract class AbstractEntityPersister implements CachedEntityPersister
 {
-     /**
-     * @var \Shitty\ORM\UnitOfWork
-     */
+        /**
+         * @var \Shitty\ORM\UnitOfWork
+         */
     protected $uow;
 
     /**
@@ -61,9 +61,9 @@ 
      */
     protected $class;
 
-     /**
-     * @var array
-     */
+        /**
+         * @var array
+         */
     protected $queuedCache = array();
 
     /**

Spacing +1 added lines, -1 removed lines

@@ -297,7 +297,7 @@
             ? $this->persister->expandCriteriaParameters($criteria)
             : $this->persister->expandParameters($criteria);
 
-        return sha1($query . serialize($params) . serialize($orderBy) . $limit . $offset . $timestamp);
+        return sha1($query.serialize($params).serialize($orderBy).$limit.$offset.$timestamp);
     }
 
     /**

lib/Shitty/ORM/Cache/Region/FileLockRegion.php

Doc Comments +1 added lines

@@ -211,6 +211,7 @@
 
     /**
      * {@inheritdoc}
+     * @return boolean
      */
     public function evictAll()
     {

Spacing +2 added lines, -2 removed lines

@@ -118,7 +118,7 @@ 
      */
     private function getLockFileName(CacheKey $key)
     {
-        return $this->directory . DIRECTORY_SEPARATOR . $key->hash . '.' . self::LOCK_EXTENSION;
+        return $this->directory.DIRECTORY_SEPARATOR.$key->hash.'.'.self::LOCK_EXTENSION;
     }
 
     /**
@@ -216,7 +216,7 @@ 
     {
         // The check below is necessary because on some platforms glob returns false
         // when nothing matched (even though no errors occurred)
-        $filenames = glob(sprintf("%s/*.%s" , $this->directory, self::LOCK_EXTENSION));
+        $filenames = glob(sprintf("%s/*.%s", $this->directory, self::LOCK_EXTENSION));
 
         if ($filenames) {
             foreach ($filenames as $filename) {

lib/Shitty/ORM/Configuration.php

Doc Comments +1 added lines, -1 removed lines

@@ -918,7 +918,7 @@
      * @since 2.5
      *
      * @param string $name  The name of the hint.
-     * @param mixed  $value The value of the hint.
+     * @param string  $value The value of the hint.
      */
     public function setDefaultQueryHint($name, $value)
     {

Spacing +1 added lines, -1 removed lines

@@ -151,7 +151,7 @@
      */
     public function newDefaultAnnotationDriver($paths = array(), $useSimpleAnnotationReader = true)
     {
-        AnnotationRegistry::registerFile(__DIR__ . '/Mapping/Driver/DoctrineAnnotations.php');
+        AnnotationRegistry::registerFile(__DIR__.'/Mapping/Driver/DoctrineAnnotations.php');
 
         if ($useSimpleAnnotationReader) {
             // Register the ORM Annotations in the AnnotationRegistry

lib/Shitty/ORM/Internal/Hydration/ObjectHydrator.php

Unused Use Statements -3 removed lines

@@ -24,9 +24,6 @@
 use Shitty\ORM\Mapping\ClassMetadata;
 use Shitty\ORM\PersistentCollection;
 use Shitty\ORM\Query;
-use Shitty\ORM\Events;
-use Shitty\ORM\Event\LifecycleEventArgs;
-use Shitty\ORM\Event\PostLoadEventDispatcher;
 use Shitty\Common\Collections\ArrayCollection;
 use Shitty\ORM\Proxy\Proxy;
 

Spacing +13 added lines, -13 removed lines

@@ -202,7 +202,7 @@ 
             $class->reflFields[$fieldName]->setValue($entity, $value);
             $this->_uow->setOriginalEntityProperty($oid, $fieldName, $value);
 
-            $this->initializedCollections[$oid . $fieldName] = $value;
+            $this->initializedCollections[$oid.$fieldName] = $value;
         } else if (
             isset($this->_hints[Query::HINT_REFRESH]) ||
             isset($this->_hints['fetched'][$parentDqlAlias][$fieldName]) &&
@@ -213,10 +213,10 @@ 
             $value->setInitialized(true);
             $value->unwrap()->clear();
 
-            $this->initializedCollections[$oid . $fieldName] = $value;
+            $this->initializedCollections[$oid.$fieldName] = $value;
         } else {
             // Is already PersistentCollection, and DON'T REFRESH or FETCH-JOIN!
-            $this->existingCollections[$oid . $fieldName] = $value;
+            $this->existingCollections[$oid.$fieldName] = $value;
         }
 
         return $value;
@@ -289,7 +289,7 @@ 
             $idHash = '';
 
             foreach ($class->identifier as $fieldName) {
-                $idHash .= ' ' . (isset($class->associationMappings[$fieldName])
+                $idHash .= ' '.(isset($class->associationMappings[$fieldName])
                     ? $data[$class->associationMappings[$fieldName]['joinColumns'][0]['name']]
                     : $data[$fieldName]);
             }
@@ -342,7 +342,7 @@ 
                 $parentAlias = $this->_rsm->parentAliasMap[$dqlAlias];
                 // we need the $path to save into the identifier map which entities were already
                 // seen for this parent-child relationship
-                $path = $parentAlias . '.' . $dqlAlias;
+                $path = $parentAlias.'.'.$dqlAlias;
 
                 // We have a RIGHT JOIN result here. Doctrine cannot hydrate RIGHT JOIN Object-Graphs
                 if ( ! isset($nonemptyComponents[$parentAlias])) {
@@ -382,7 +382,7 @@ 
                     $reflFieldValue = $reflField->getValue($parentObject);
 
                     if (isset($nonemptyComponents[$dqlAlias])) {
-                        $collKey = $oid . $relationField;
+                        $collKey = $oid.$relationField;
                         if (isset($this->initializedCollections[$collKey])) {
                             $reflFieldValue = $this->initializedCollections[$collKey];
                         } else if ( ! isset($this->existingCollections[$collKey])) {
@@ -430,7 +430,7 @@ 
                     // PATH B: Single-valued association
                     $reflFieldValue = $reflField->getValue($parentObject);
 
-                    if ( ! $reflFieldValue || isset($this->_hints[Query::HINT_REFRESH]) || ($reflFieldValue instanceof Proxy && !$reflFieldValue->__isInitialized__)) {
+                    if ( ! $reflFieldValue || isset($this->_hints[Query::HINT_REFRESH]) || ($reflFieldValue instanceof Proxy && ! $reflFieldValue->__isInitialized__)) {
                         // we only need to take action if this value is null,
                         // we refresh the entity or its an unitialized proxy.
                         if (isset($nonemptyComponents[$dqlAlias])) {
@@ -475,7 +475,7 @@ 
                 $entityKey = $this->_rsm->entityMappings[$dqlAlias] ?: 0;
 
                 // if this row has a NULL value for the root result id then make it a null result.
-                if ( ! isset($nonemptyComponents[$dqlAlias]) ) {
+                if ( ! isset($nonemptyComponents[$dqlAlias])) {
                     if ($this->_rsm->isMixed) {
                         $result[] = array($entityKey => null);
                     } else {
@@ -531,13 +531,13 @@ 
             }
         }
 
-        if ( ! isset($resultKey) ) {
+        if ( ! isset($resultKey)) {
             $this->resultCounter++;
         }
 
         // Append scalar values to mixed result sets
         if (isset($rowData['scalars'])) {
-            if ( ! isset($resultKey) ) {
+            if ( ! isset($resultKey)) {
                 $resultKey = (isset($this->_rsm->indexByMap['scalars']))
                     ? $row[$this->_rsm->indexByMap['scalars']]
                     : $this->resultCounter - 1;
@@ -550,19 +550,19 @@ 
 
         // Append new object to mixed result sets
         if (isset($rowData['newObjects'])) {
-            if ( ! isset($resultKey) ) {
+            if ( ! isset($resultKey)) {
                 $resultKey = $this->resultCounter - 1;
             }
 
 
-            $scalarCount = (isset($rowData['scalars'])? count($rowData['scalars']): 0);
+            $scalarCount = (isset($rowData['scalars']) ? count($rowData['scalars']) : 0);
 
             foreach ($rowData['newObjects'] as $objIndex => $newObject) {
                 $class  = $newObject['class'];
                 $args   = $newObject['args'];
                 $obj    = $class->newInstanceArgs($args);
 
-                if ($scalarCount == 0 && count($rowData['newObjects']) == 1 ) {
+                if ($scalarCount == 0 && count($rowData['newObjects']) == 1) {
                     $result[$resultKey] = $obj;
 
                     continue;

lib/Shitty/ORM/Internal/Hydration/SimpleObjectHydrator.php

Unused Use Statements -1 removed lines

@@ -20,7 +20,6 @@
 namespace Shitty\ORM\Internal\Hydration;
 
 use PDO;
-use Shitty\DBAL\Types\Type;
 use Shitty\ORM\Mapping\ClassMetadata;
 use Shitty\ORM\Query;
 

lib/Shitty/ORM/Mapping/Builder/ClassMetadataBuilder.php

Doc Comments +2 added lines, -2 removed lines

@@ -143,7 +143,7 @@ 
     /**
      * Adds Index.
      *
-     * @param array  $columns
+     * @param string[]  $columns
      * @param string $name
      *
      * @return ClassMetadataBuilder
@@ -162,7 +162,7 @@ 
     /**
      * Adds Unique Constraint.
      *
-     * @param array  $columns
+     * @param string[]  $columns
      * @param string $name
      *
      * @return ClassMetadataBuilder

Spacing +1 added lines, -1 removed lines

@@ -150,7 +150,7 @@
      */
     public function addIndex(array $columns, $name)
     {
-        if (!isset($this->cm->table['indexes'])) {
+        if ( ! isset($this->cm->table['indexes'])) {
             $this->cm->table['indexes'] = array();
         }