RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-02-09 00:39:25 +03:00
Code Issues Projects Releases Wiki Activity

Fixed many small phpcs issues

Browse Source
This commit is contained in:
Jeroen Thora 2014-12-19 22:27:26 +01:00 committed by Marco Pivetta
parent 3971e8c55b
commit 6dcb97a20e
80 changed files with 358 additions and 294 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/Doctrine/ORM/AbstractQuery.php
View File

@ -178,7 +178,6 @@ abstract class AbstractQuery
}
/**
*
* Enable/disable second level query (result) caching for this query.
*
* @param boolean $cacheable
@ -243,7 +242,7 @@ abstract class AbstractQuery
*
* @param integer $lifetime
*
* @return static This query instance.
* @return \Doctrine\ORM\AbstractQuery This query instance.
*/
public function setLifetime($lifetime)
{
@ -263,7 +262,7 @@ abstract class AbstractQuery
/**
* @param integer $cacheMode
*
* @return static This query instance.
* @return \Doctrine\ORM\AbstractQuery This query instance.
*/
public function setCacheMode($cacheMode)
{

2
lib/Doctrine/ORM/Cache/AssociationCacheEntry.php
View File

@ -58,6 +58,8 @@ class AssociationCacheEntry implements CacheEntry
* This method allow Doctrine\Common\Cache\PhpFileCache compatibility
*
* @param array $values array containing property values
*
* @return AssociationCacheEntry
*/
public static function __set_state(array $values)
{

3
lib/Doctrine/ORM/Cache/CacheException.php
View File

@ -62,8 +62,9 @@ class CacheException extends ORMException
/**
* @param string $entityName
* @param string $field
*
* @return \Doctrine\ORM\Cache\CacheException
* @return CacheException
*/
public static function nonCacheableEntityAssociation($entityName, $field)
{

2
lib/Doctrine/ORM/Cache/CollectionCacheEntry.php
View File

@ -50,7 +50,7 @@ class CollectionCacheEntry implements CacheEntry
*
* @param array $values array containing property values
*
* @return self
* @return CollectionCacheEntry
*/
public static function __set_state(array $values)
{

2
lib/Doctrine/ORM/Cache/EntityCacheEntry.php
View File

@ -60,6 +60,8 @@ class EntityCacheEntry implements CacheEntry
* This method allow Doctrine\Common\Cache\PhpFileCache compatibility
*
* @param array $values array containing property values
*
* @return EntityCacheEntry
*/
public static function __set_state(array $values)
{

1
lib/Doctrine/ORM/Cache/Persister/Entity/CachedEntityPersister.php
View File

@ -40,6 +40,7 @@ interface CachedEntityPersister extends CachedPersister, EntityPersister
/**
* @param object $entity
* @param \Doctrine\ORM\Cache\EntityCacheKey $key
*
* @return boolean
*/
public function storeEntityCache($entity, EntityCacheKey $key);

2
lib/Doctrine/ORM/Cache/QueryCacheEntry.php
View File

@ -54,6 +54,8 @@ class QueryCacheEntry implements CacheEntry
/**
* @param array $values
*
* @return QueryCacheEntry
*/
public static function __set_state(array $values)
{

22
lib/Doctrine/ORM/Cache/Region/FileLockRegion.php
View File

@ -114,7 +114,7 @@ class FileLockRegion implements ConcurrentRegion
/**
* @param \Doctrine\ORM\Cache\CacheKey $key
*
* return string
* @return string
*/
private function getLockFileName(CacheKey $key)
{
@ -124,7 +124,7 @@ class FileLockRegion implements ConcurrentRegion
/**
* @param string $filename
*
* return string
* @return string
*/
private function getLockContent($filename)
{
@ -134,7 +134,7 @@ class FileLockRegion implements ConcurrentRegion
/**
* @param string $filename
*
* return integer
* @return integer
*/
private function getLockTime($filename)
{
@ -142,7 +142,7 @@ class FileLockRegion implements ConcurrentRegion
}
/**
* {inheritdoc}
* {@inheritdoc}
*/
public function getName()
{
@ -150,7 +150,7 @@ class FileLockRegion implements ConcurrentRegion
}
/**
* {inheritdoc}
* {@inheritdoc}
*/
public function contains(CacheKey $key)
{
@ -162,7 +162,7 @@ class FileLockRegion implements ConcurrentRegion
}
/**
* {inheritdoc}
* {@inheritdoc}
*/
public function get(CacheKey $key)
{
@ -186,7 +186,7 @@ class FileLockRegion implements ConcurrentRegion
}
/**
* {inheritdoc}
* {@inheritdoc}
*/
public function put(CacheKey $key, CacheEntry $entry, Lock $lock = null)
{
@ -198,7 +198,7 @@ class FileLockRegion implements ConcurrentRegion
}
/**
* {inheritdoc}
* {@inheritdoc}
*/
public function evict(CacheKey $key)
{
@ -210,7 +210,7 @@ class FileLockRegion implements ConcurrentRegion
}
/**
* {inheritdoc}
* {@inheritdoc}
*/
public function evictAll()
{
@ -228,7 +228,7 @@ class FileLockRegion implements ConcurrentRegion
}
/**
* {inheritdoc}
* {@inheritdoc}
*/
public function lock(CacheKey $key)
{
@ -248,7 +248,7 @@ class FileLockRegion implements ConcurrentRegion
}
/**
* {inheritdoc}
* {@inheritdoc}
*/
public function unlock(CacheKey $key, Lock $lock)
{

4
lib/Doctrine/ORM/Cache/TimestampCacheEntry.php
View File

@ -40,7 +40,7 @@ class TimestampCacheEntry implements CacheEntry
*/
public function __construct($time = null)
{
$this->time = $time ? (float)$time : microtime(true);
$this->time = $time ? (float) $time : microtime(true);
}
/**
@ -49,6 +49,8 @@ class TimestampCacheEntry implements CacheEntry
* This method allow Doctrine\Common\Cache\PhpFileCache compatibility
*
* @param array $values array containing property values
*
* @return TimestampCacheEntry
*/
public static function __set_state(array $values)
{

2
lib/Doctrine/ORM/Configuration.php
View File

@ -98,7 +98,7 @@ class Configuration extends \Doctrine\DBAL\Configuration
*/
public function setAutoGenerateProxyClasses($autoGenerate)
{
$this->_attributes['autoGenerateProxyClasses'] = (int)$autoGenerate;
$this->_attributes['autoGenerateProxyClasses'] = (int) $autoGenerate;
}
/**

10
lib/Doctrine/ORM/EntityManager.php
View File

@ -571,7 +571,7 @@ use Doctrine\Common\Util\ClassUtils;
public function persist($entity)
{
if ( ! is_object($entity)) {
throw ORMInvalidArgumentException::invalidObject('EntityManager#persist()' , $entity);
throw ORMInvalidArgumentException::invalidObject('EntityManager#persist()', $entity);
}
$this->errorIfClosed();
@ -594,7 +594,7 @@ use Doctrine\Common\Util\ClassUtils;
public function remove($entity)
{
if ( ! is_object($entity)) {
throw ORMInvalidArgumentException::invalidObject('EntityManager#remove()' , $entity);
throw ORMInvalidArgumentException::invalidObject('EntityManager#remove()', $entity);
}
$this->errorIfClosed();
@ -615,7 +615,7 @@ use Doctrine\Common\Util\ClassUtils;
public function refresh($entity)
{
if ( ! is_object($entity)) {
throw ORMInvalidArgumentException::invalidObject('EntityManager#refresh()' , $entity);
throw ORMInvalidArgumentException::invalidObject('EntityManager#refresh()', $entity);
}
$this->errorIfClosed();
@ -639,7 +639,7 @@ use Doctrine\Common\Util\ClassUtils;
public function detach($entity)
{
if ( ! is_object($entity)) {
throw ORMInvalidArgumentException::invalidObject('EntityManager#detach()' , $entity);
throw ORMInvalidArgumentException::invalidObject('EntityManager#detach()', $entity);
}
$this->unitOfWork->detach($entity);
@ -659,7 +659,7 @@ use Doctrine\Common\Util\ClassUtils;
public function merge($entity)
{
if ( ! is_object($entity)) {
throw ORMInvalidArgumentException::invalidObject('EntityManager#merge()' , $entity);
throw ORMInvalidArgumentException::invalidObject('EntityManager#merge()', $entity);
}
$this->errorIfClosed();

6
lib/Doctrine/ORM/Event/ListenersInvoker.php
View File

@ -97,13 +97,13 @@ class ListenersInvoker
*/
public function invoke(ClassMetadata $metadata, $eventName, $entity, EventArgs $event, $invoke)
{
if($invoke & self::INVOKE_CALLBACKS) {
if ($invoke & self::INVOKE_CALLBACKS) {
foreach ($metadata->lifecycleCallbacks[$eventName] as $callback) {
$entity->$callback($event);
}
}
if($invoke & self::INVOKE_LISTENERS) {
if ($invoke & self::INVOKE_LISTENERS) {
foreach ($metadata->entityListeners[$eventName] as $listener) {
$class = $listener['class'];
$method = $listener['method'];
@ -113,7 +113,7 @@ class ListenersInvoker
}
}
if($invoke & self::INVOKE_MANAGER) {
if ($invoke & self::INVOKE_MANAGER) {
$this->eventManager->dispatchEvent($eventName, $event);
}
}

2
lib/Doctrine/ORM/Id/IdentityGenerator.php
View File

@ -52,7 +52,7 @@ class IdentityGenerator extends AbstractIdGenerator
*/
public function generate(EntityManager $em, $entity)
{
return (int)$em->getConnection()->lastInsertId($this->sequenceName);
return (int) $em->getConnection()->lastInsertId($this->sequenceName);
}
/**

2
lib/Doctrine/ORM/Id/SequenceGenerator.php
View File

@ -76,7 +76,7 @@ class SequenceGenerator extends AbstractIdGenerator implements Serializable
$conn = $em->getConnection();
$sql = $conn->getDatabasePlatform()->getSequenceNextValSQL($this->_sequenceName);
$this->_nextValue = (int)$conn->fetchColumn($sql);
$this->_nextValue = (int) $conn->fetchColumn($sql);
$this->_maxValue = $this->_nextValue + $this->_allocationSize;
}

1
lib/Doctrine/ORM/Id/UuidGenerator.php
View File

@ -36,6 +36,7 @@ class UuidGenerator extends AbstractIdGenerator
{
$conn = $em->getConnection();
$sql = 'SELECT ' . $conn->getDatabasePlatform()->getGuidExpression();
return $conn->query($sql)->fetchColumn(0);
}
}

1
lib/Doctrine/ORM/Internal/Hydration/IterableResult.php
View File

@ -80,6 +80,7 @@ class IterableResult implements \Iterator
{
$this->_current = $this->_hydrator->hydrateRow();
$this->_key++;
return $this->_current;
}

1
lib/Doctrine/ORM/LazyCriteriaCollection.php
View File

@ -100,6 +100,7 @@ class LazyCriteriaCollection extends AbstractLazyCollection implements Selectabl
* Do an optimized search of an element
*
* @param object $element
*
* @return bool
*/
public function contains($element)

13
lib/Doctrine/ORM/Mapping/Builder/AssociationBuilder.php
View File

@ -63,6 +63,7 @@ class AssociationBuilder
public function mappedBy($fieldName)
{
$this->mapping['mappedBy'] = $fieldName;
return $this;
}
@ -74,6 +75,7 @@ class AssociationBuilder
public function inversedBy($fieldName)
{
$this->mapping['inversedBy'] = $fieldName;
return $this;
}
@ -83,6 +85,7 @@ class AssociationBuilder
public function cascadeAll()
{
$this->mapping['cascade'] = array("ALL");
return $this;
}
@ -92,6 +95,7 @@ class AssociationBuilder
public function cascadePersist()
{
$this->mapping['cascade'][] = "persist";
return $this;
}
@ -101,6 +105,7 @@ class AssociationBuilder
public function cascadeRemove()
{
$this->mapping['cascade'][] = "remove";
return $this;
}
@ -110,6 +115,7 @@ class AssociationBuilder
public function cascadeMerge()
{
$this->mapping['cascade'][] = "merge";
return $this;
}
@ -119,6 +125,7 @@ class AssociationBuilder
public function cascadeDetach()
{
$this->mapping['cascade'][] = "detach";
return $this;
}
@ -128,6 +135,7 @@ class AssociationBuilder
public function cascadeRefresh()
{
$this->mapping['cascade'][] = "refresh";
return $this;
}
@ -137,6 +145,7 @@ class AssociationBuilder
public function fetchExtraLazy()
{
$this->mapping['fetch'] = ClassMetadata::FETCH_EXTRA_LAZY;
return $this;
}
@ -146,6 +155,7 @@ class AssociationBuilder
public function fetchEager()
{
$this->mapping['fetch'] = ClassMetadata::FETCH_EAGER;
return $this;
}
@ -155,6 +165,7 @@ class AssociationBuilder
public function fetchLazy()
{
$this->mapping['fetch'] = ClassMetadata::FETCH_LAZY;
return $this;
}
@ -180,6 +191,7 @@ class AssociationBuilder
'onDelete' => $onDelete,
'columnDefinition' => $columnDef,
);
return $this;
}
@ -226,6 +238,7 @@ class AssociationBuilder
} else {
throw new \InvalidArgumentException("Type should be a ToOne Association here");
}
return $this->builder;
}
}

16
lib/Doctrine/ORM/Mapping/Builder/FieldBuilder.php
View File

@ -79,6 +79,7 @@ class FieldBuilder
public function length($length)
{
$this->mapping['length'] = $length;
return $this;
}
@ -91,7 +92,8 @@ class FieldBuilder
*/
public function nullable($flag = true)
{
$this->mapping['nullable'] = (bool)$flag;
$this->mapping['nullable'] = (bool) $flag;
return $this;
}
@ -104,7 +106,8 @@ class FieldBuilder
*/
public function unique($flag = true)
{
$this->mapping['unique'] = (bool)$flag;
$this->mapping['unique'] = (bool) $flag;
return $this;
}
@ -118,6 +121,7 @@ class FieldBuilder
public function columnName($name)
{
$this->mapping['columnName'] = $name;
return $this;
}
@ -131,6 +135,7 @@ class FieldBuilder
public function precision($p)
{
$this->mapping['precision'] = $p;
return $this;
}
@ -144,6 +149,7 @@ class FieldBuilder
public function scale($s)
{
$this->mapping['scale'] = $s;
return $this;
}
@ -166,6 +172,7 @@ class FieldBuilder
public function makePrimaryKey()
{
$this->mapping['id'] = true;
return $this;
}
@ -180,6 +187,7 @@ class FieldBuilder
public function option($name, $value)
{
$this->mapping['options'][$name] = $value;
return $this;
}
@ -191,6 +199,7 @@ class FieldBuilder
public function generatedValue($strategy = 'AUTO')
{
$this->generatedValue = $strategy;
return $this;
}
@ -202,6 +211,7 @@ class FieldBuilder
public function isVersionField()
{
$this->version = true;
return $this;
}
@ -221,6 +231,7 @@ class FieldBuilder
'allocationSize' => $allocationSize,
'initialValue' => $initialValue,
);
return $this;
}
@ -234,6 +245,7 @@ class FieldBuilder
public function columnDefinition($def)
{
$this->mapping['columnDefinition'] = $def;
return $this;
}

3
lib/Doctrine/ORM/Mapping/Builder/ManyToManyAssociationBuilder.php
View File

@ -47,6 +47,7 @@ class ManyToManyAssociationBuilder extends OneToManyAssociationBuilder
public function setJoinTable($name)
{
$this->joinTableName = $name;
return $this;
}
@ -72,6 +73,7 @@ class ManyToManyAssociationBuilder extends OneToManyAssociationBuilder
'onDelete' => $onDelete,
'columnDefinition' => $columnDef,
);
return $this;
}
@ -93,6 +95,7 @@ class ManyToManyAssociationBuilder extends OneToManyAssociationBuilder
}
$cm = $this->builder->getClassMetadata();
$cm->mapManyToMany($mapping);
return $this->builder;
}
}

3
lib/Doctrine/ORM/Mapping/Builder/OneToManyAssociationBuilder.php
View File

@ -37,6 +37,7 @@ class OneToManyAssociationBuilder extends AssociationBuilder
public function setOrderBy(array $fieldNames)
{
$this->mapping['orderBy'] = $fieldNames;
return $this;
}
@ -48,6 +49,7 @@ class OneToManyAssociationBuilder extends AssociationBuilder
public function setIndexBy($fieldName)
{
$this->mapping['indexBy'] = $fieldName;
return $this;
}
@ -62,6 +64,7 @@ class OneToManyAssociationBuilder extends AssociationBuilder
}
$cm = $this->builder->getClassMetadata();
$cm->mapOneToMany($mapping);
return $this->builder;
}
}

1
lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php
View File

@ -386,6 +386,7 @@ class ClassMetadataFactory extends AbstractClassMetadataFactory
}
$parts = explode("\\", $className);
return strtolower(end($parts));
}

6
lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
View File

@ -698,6 +698,7 @@ class ClassMetadataInfo implements ClassMetadata
if ($this->isIdentifierComposite) {
throw new BadMethodCallException("Class " . $this->name . " has a composite identifier.");
}
return $this->reflFields[$this->identifier[0]];
}
@ -3248,6 +3249,7 @@ class ClassMetadataInfo implements ClassMetadata
/**
* @param string|null $className
*
* @return string|null null if the input value is null
*/
public function fullyQualifiedClassName($className)
@ -3268,7 +3270,8 @@ class ClassMetadataInfo implements ClassMetadata
*
* @return mixed
*/
public function getMetadataValue($name) {
public function getMetadataValue($name)
{
if (isset($this->$name)) {
return $this->$name;
@ -3281,6 +3284,7 @@ class ClassMetadataInfo implements ClassMetadata
* Map Embedded Class
*
* @param array $mapping
*
* @throws MappingException
* @return void
*/

2
lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php
View File

@ -526,7 +526,7 @@ class AnnotationDriver extends AbstractAnnotationDriver
*/
private function getFetchMode($className, $fetchMode)
{
if( ! defined('Doctrine\ORM\Mapping\ClassMetadata::FETCH_' . $fetchMode)) {
if ( ! defined('Doctrine\ORM\Mapping\ClassMetadata::FETCH_' . $fetchMode)) {
throw MappingException::invalidFetchMode($className, $fetchMode);
}

5
lib/Doctrine/ORM/Mapping/Driver/DatabaseDriver.php
View File

@ -319,7 +319,7 @@ class DatabaseDriver implements MappingDriver
$tableName = $metadata->table['name'];
$indexes = $this->tables[$tableName]->getIndexes();
foreach($indexes as $index){
foreach ($indexes as $index) {
if ($index->isPrimary()) {
continue;
}
@ -506,7 +506,7 @@ class DatabaseDriver implements MappingDriver
{
try {
return $table->getPrimaryKey()->getColumns();
} catch(SchemaException $e) {
} catch (SchemaException $e) {
// Do nothing
}
@ -550,6 +550,7 @@ class DatabaseDriver implements MappingDriver
if ($fk) {
$columnName = str_replace('_id', '', $columnName);
}
return Inflector::camelize($columnName);
}
}

131
lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php
View File

@ -59,14 +59,14 @@ class XmlDriver extends FileDriver
if ($xmlRoot->getName() == 'entity') {
if (isset($xmlRoot['repository-class'])) {
$metadata->setCustomRepositoryClass((string)$xmlRoot['repository-class']);
$metadata->setCustomRepositoryClass((string) $xmlRoot['repository-class']);
}
if (isset($xmlRoot['read-only']) && $this->evaluateBoolean($xmlRoot['read-only'])) {
$metadata->markReadOnly();
}
} else if ($xmlRoot->getName() == 'mapped-superclass') {
$metadata->setCustomRepositoryClass(
isset($xmlRoot['repository-class']) ? (string)$xmlRoot['repository-class'] : null
isset($xmlRoot['repository-class']) ? (string) $xmlRoot['repository-class'] : null
);
$metadata->isMappedSuperclass = true;
} else if ($xmlRoot->getName() == 'embeddable') {
@ -97,8 +97,8 @@ class XmlDriver extends FileDriver
if (isset($xmlRoot->{'named-queries'})) {
foreach ($xmlRoot->{'named-queries'}->{'named-query'} as $namedQueryElement) {
$metadata->addNamedQuery(array(
'name' => (string)$namedQueryElement['name'],
'query' => (string)$namedQueryElement['query']
'name' => (string) $namedQueryElement['name'],
'query' => (string) $namedQueryElement['query']
));
}
}
@ -107,10 +107,10 @@ class XmlDriver extends FileDriver
if (isset($xmlRoot->{'named-native-queries'})) {
foreach ($xmlRoot->{'named-native-queries'}->{'named-native-query'} as $nativeQueryElement) {
$metadata->addNamedNativeQuery(array(
'name' => isset($nativeQueryElement['name']) ? (string)$nativeQueryElement['name'] : null,
'query' => isset($nativeQueryElement->query) ? (string)$nativeQueryElement->query : null,
'resultClass' => isset($nativeQueryElement['result-class']) ? (string)$nativeQueryElement['result-class'] : null,
'resultSetMapping' => isset($nativeQueryElement['result-set-mapping']) ? (string)$nativeQueryElement['result-set-mapping'] : null,
'name' => isset($nativeQueryElement['name']) ? (string) $nativeQueryElement['name'] : null,
'query' => isset($nativeQueryElement->query) ? (string) $nativeQueryElement->query : null,
'resultClass' => isset($nativeQueryElement['result-class']) ? (string) $nativeQueryElement['result-class'] : null,
'resultSetMapping' => isset($nativeQueryElement['result-set-mapping']) ? (string) $nativeQueryElement['result-set-mapping'] : null,
));
}
}
@ -125,14 +125,14 @@ class XmlDriver extends FileDriver
if (isset($entityElement['entity-class'])) {
$entityResult = array(
'fields' => array(),
'entityClass' => (string)$entityElement['entity-class'],
'discriminatorColumn' => isset($entityElement['discriminator-column']) ? (string)$entityElement['discriminator-column'] : null,
'entityClass' => (string) $entityElement['entity-class'],
'discriminatorColumn' => isset($entityElement['discriminator-column']) ? (string) $entityElement['discriminator-column'] : null,
);
foreach ($entityElement as $fieldElement) {
$entityResult['fields'][] = array(
'name' => isset($fieldElement['name']) ? (string)$fieldElement['name'] : null,
'column' => isset($fieldElement['column']) ? (string)$fieldElement['column'] : null,
'name' => isset($fieldElement['name']) ? (string) $fieldElement['name'] : null,
'column' => isset($fieldElement['column']) ? (string) $fieldElement['column'] : null,
);
}
@ -142,13 +142,13 @@ class XmlDriver extends FileDriver
//<column-result/>
if (isset($entityElement['name'])) {
$columns[] = array(
'name' => (string)$entityElement['name'],
'name' => (string) $entityElement['name'],
);
}
}
$metadata->addSqlResultSetMapping(array(
'name' => (string)$rsmElement['name'],
'name' => (string) $rsmElement['name'],
'entities' => $entities,
'columns' => $columns
));
@ -156,7 +156,7 @@ class XmlDriver extends FileDriver
}
if (isset($xmlRoot['inheritance-type'])) {
$inheritanceType = (string)$xmlRoot['inheritance-type'];
$inheritanceType = (string) $xmlRoot['inheritance-type'];
$metadata->setInheritanceType(constant('Doctrine\ORM\Mapping\ClassMetadata::INHERITANCE_TYPE_' . $inheritanceType));
if ($metadata->inheritanceType != \Doctrine\ORM\Mapping\ClassMetadata::INHERITANCE_TYPE_NONE) {
@ -164,10 +164,10 @@ class XmlDriver extends FileDriver
if (isset($xmlRoot->{'discriminator-column'})) {
$discrColumn = $xmlRoot->{'discriminator-column'};
$metadata->setDiscriminatorColumn(array(
'name' => isset($discrColumn['name']) ? (string)$discrColumn['name'] : null,
'type' => isset($discrColumn['type']) ? (string)$discrColumn['type'] : null,
'length' => isset($discrColumn['length']) ? (string)$discrColumn['length'] : null,
'columnDefinition' => isset($discrColumn['column-definition']) ? (string)$discrColumn['column-definition'] : null
'name' => isset($discrColumn['name']) ? (string) $discrColumn['name'] : null,
'type' => isset($discrColumn['type']) ? (string) $discrColumn['type'] : null,
'length' => isset($discrColumn['length']) ? (string) $discrColumn['length'] : null,
'columnDefinition' => isset($discrColumn['column-definition']) ? (string) $discrColumn['column-definition'] : null
));
} else {
$metadata->setDiscriminatorColumn(array('name' => 'dtype', 'type' => 'string', 'length' => 255));
@ -177,7 +177,7 @@ class XmlDriver extends FileDriver
if (isset($xmlRoot->{'discriminator-map'})) {
$map = array();
foreach ($xmlRoot->{'discriminator-map'}->{'discriminator-mapping'} as $discrMapElement) {
$map[(string)$discrMapElement['value']] = (string)$discrMapElement['class'];
$map[(string) $discrMapElement['value']] = (string) $discrMapElement['class'];
}
$metadata->setDiscriminatorMap($map);
}
@ -188,7 +188,7 @@ class XmlDriver extends FileDriver
// Evaluate <change-tracking-policy...>
if (isset($xmlRoot['change-tracking-policy'])) {
$metadata->setChangeTrackingPolicy(constant('Doctrine\ORM\Mapping\ClassMetadata::CHANGETRACKING_'
. strtoupper((string)$xmlRoot['change-tracking-policy'])));
. strtoupper((string) $xmlRoot['change-tracking-policy'])));
}
// Evaluate <indexes...>
@ -225,7 +225,7 @@ class XmlDriver extends FileDriver
}
if (isset($uniqueXml['name'])) {
$metadata->table['uniqueConstraints'][(string)$uniqueXml['name']] = $unique;
$metadata->table['uniqueConstraints'][(string) $uniqueXml['name']] = $unique;
} else {
$metadata->table['uniqueConstraints'][] = $unique;
}
@ -285,29 +285,29 @@ class XmlDriver extends FileDriver
$associationIds = array();
foreach ($xmlRoot->id as $idElement) {
if (isset($idElement['association-key']) && $this->evaluateBoolean($idElement['association-key'])) {
$associationIds[(string)$idElement['name']] = true;
$associationIds[(string) $idElement['name']] = true;
continue;
}
$mapping = array(
'id' => true,
'fieldName' => (string)$idElement['name']
'fieldName' => (string) $idElement['name']
);
if (isset($idElement['type'])) {
$mapping['type'] = (string)$idElement['type'];
$mapping['type'] = (string) $idElement['type'];
}
if (isset($idElement['length'])) {
$mapping['length'] = (string)$idElement['length'];
$mapping['length'] = (string) $idElement['length'];
}
if (isset($idElement['column'])) {
$mapping['columnName'] = (string)$idElement['column'];
$mapping['columnName'] = (string) $idElement['column'];
}
if (isset($idElement['column-definition'])) {
$mapping['columnDefinition'] = (string)$idElement['column-definition'];
$mapping['columnDefinition'] = (string) $idElement['column-definition'];
}
if (isset($idElement->options)) {
@ -318,7 +318,7 @@ class XmlDriver extends FileDriver
if (isset($idElement->generator)) {
$strategy = isset($idElement->generator['strategy']) ?
(string)$idElement->generator['strategy'] : 'AUTO';
(string) $idElement->generator['strategy'] : 'AUTO';
$metadata->setIdGeneratorType(constant('Doctrine\ORM\Mapping\ClassMetadata::GENERATOR_TYPE_'
. $strategy));
}
@ -327,9 +327,9 @@ class XmlDriver extends FileDriver
if (isset($idElement->{'sequence-generator'})) {
$seqGenerator = $idElement->{'sequence-generator'};
$metadata->setSequenceGeneratorDefinition(array(
'sequenceName' => (string)$seqGenerator['sequence-name'],
'allocationSize' => (string)$seqGenerator['allocation-size'],
'initialValue' => (string)$seqGenerator['initial-value']
'sequenceName' => (string) $seqGenerator['sequence-name'],
'allocationSize' => (string) $seqGenerator['allocation-size'],
'initialValue' => (string) $seqGenerator['initial-value']
));
} else if (isset($idElement->{'custom-id-generator'})) {
$customGenerator = $idElement->{'custom-id-generator'};
@ -345,8 +345,8 @@ class XmlDriver extends FileDriver
if (isset($xmlRoot->{'one-to-one'})) {
foreach ($xmlRoot->{'one-to-one'} as $oneToOneElement) {
$mapping = array(
'fieldName' => (string)$oneToOneElement['field'],
'targetEntity' => (string)$oneToOneElement['target-entity']
'fieldName' => (string) $oneToOneElement['field'],
'targetEntity' => (string) $oneToOneElement['target-entity']
);
if (isset($associationIds[$mapping['fieldName']])) {
@ -354,14 +354,14 @@ class XmlDriver extends FileDriver
}
if (isset($oneToOneElement['fetch'])) {
$mapping['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_' . (string)$oneToOneElement['fetch']);
$mapping['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_' . (string) $oneToOneElement['fetch']);
}
if (isset($oneToOneElement['mapped-by'])) {
$mapping['mappedBy'] = (string)$oneToOneElement['mapped-by'];
$mapping['mappedBy'] = (string) $oneToOneElement['mapped-by'];
} else {
if (isset($oneToOneElement['inversed-by'])) {
$mapping['inversedBy'] = (string)$oneToOneElement['inversed-by'];
$mapping['inversedBy'] = (string) $oneToOneElement['inversed-by'];
}
$joinColumns = array();
@ -397,13 +397,13 @@ class XmlDriver extends FileDriver
if (isset($xmlRoot->{'one-to-many'})) {
foreach ($xmlRoot->{'one-to-many'} as $oneToManyElement) {
$mapping = array(
'fieldName' => (string)$oneToManyElement['field'],
'targetEntity' => (string)$oneToManyElement['target-entity'],
'mappedBy' => (string)$oneToManyElement['mapped-by']
'fieldName' => (string) $oneToManyElement['field'],
'targetEntity' => (string) $oneToManyElement['target-entity'],
'mappedBy' => (string) $oneToManyElement['mapped-by']
);
if (isset($oneToManyElement['fetch'])) {
$mapping['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_' . (string)$oneToManyElement['fetch']);
$mapping['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_' . (string) $oneToManyElement['fetch']);
}
if (isset($oneToManyElement->cascade)) {
@ -417,13 +417,13 @@ class XmlDriver extends FileDriver
if (isset($oneToManyElement->{'order-by'})) {
$orderBy = array();
foreach ($oneToManyElement->{'order-by'}->{'order-by-field'} as $orderByField) {
$orderBy[(string)$orderByField['name']] = (string)$orderByField['direction'];
$orderBy[(string) $orderByField['name']] = (string) $orderByField['direction'];
}
$mapping['orderBy'] = $orderBy;
}
if (isset($oneToManyElement['index-by'])) {
$mapping['indexBy'] = (string)$oneToManyElement['index-by'];
$mapping['indexBy'] = (string) $oneToManyElement['index-by'];
} else if (isset($oneToManyElement->{'index-by'})) {
throw new \InvalidArgumentException("<index-by /> is not a valid tag");
}
@ -441,8 +441,8 @@ class XmlDriver extends FileDriver
if (isset($xmlRoot->{'many-to-one'})) {
foreach ($xmlRoot->{'many-to-one'} as $manyToOneElement) {
$mapping = array(
'fieldName' => (string)$manyToOneElement['field'],
'targetEntity' => (string)$manyToOneElement['target-entity']
'fieldName' => (string) $manyToOneElement['field'],
'targetEntity' => (string) $manyToOneElement['target-entity']
);
if (isset($associationIds[$mapping['fieldName']])) {
@ -450,11 +450,11 @@ class XmlDriver extends FileDriver
}
if (isset($manyToOneElement['fetch'])) {
$mapping['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_' . (string)$manyToOneElement['fetch']);
$mapping['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_' . (string) $manyToOneElement['fetch']);
}
if (isset($manyToOneElement['inversed-by'])) {
$mapping['inversedBy'] = (string)$manyToOneElement['inversed-by'];
$mapping['inversedBy'] = (string) $manyToOneElement['inversed-by'];
}
$joinColumns = array();
@ -487,12 +487,12 @@ class XmlDriver extends FileDriver
if (isset($xmlRoot->{'many-to-many'})) {
foreach ($xmlRoot->{'many-to-many'} as $manyToManyElement) {
$mapping = array(
'fieldName' => (string)$manyToManyElement['field'],
'targetEntity' => (string)$manyToManyElement['target-entity']
'fieldName' => (string) $manyToManyElement['field'],
'targetEntity' => (string) $manyToManyElement['target-entity']
);
if (isset($manyToManyElement['fetch'])) {
$mapping['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_' . (string)$manyToManyElement['fetch']);
$mapping['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_' . (string) $manyToManyElement['fetch']);
}
if (isset($manyToManyElement['orphan-removal'])) {
@ -500,19 +500,19 @@ class XmlDriver extends FileDriver
}
if (isset($manyToManyElement['mapped-by'])) {
$mapping['mappedBy'] = (string)$manyToManyElement['mapped-by'];
$mapping['mappedBy'] = (string) $manyToManyElement['mapped-by'];
} else if (isset($manyToManyElement->{'join-table'})) {
if (isset($manyToManyElement['inversed-by'])) {
$mapping['inversedBy'] = (string)$manyToManyElement['inversed-by'];
$mapping['inversedBy'] = (string) $manyToManyElement['inversed-by'];
}
$joinTableElement = $manyToManyElement->{'join-table'};
$joinTable = array(
'name' => (string)$joinTableElement['name']
'name' => (string) $joinTableElement['name']
);
if (isset($joinTableElement['schema'])) {
$joinTable['schema'] = (string)$joinTableElement['schema'];
$joinTable['schema'] = (string) $joinTableElement['schema'];
}
foreach ($joinTableElement->{'join-columns'}->{'join-column'} as $joinColumnElement) {
@ -533,13 +533,13 @@ class XmlDriver extends FileDriver
if (isset($manyToManyElement->{'order-by'})) {
$orderBy = array();
foreach ($manyToManyElement->{'order-by'}->{'order-by-field'} as $orderByField) {
$orderBy[(string)$orderByField['name']] = (string)$orderByField['direction'];
$orderBy[(string) $orderByField['name']] = (string) $orderByField['direction'];
}
$mapping['orderBy'] = $orderBy;
}
if (isset($manyToManyElement['index-by'])) {
$mapping['indexBy'] = (string)$manyToManyElement['index-by'];
$mapping['indexBy'] = (string) $manyToManyElement['index-by'];
} else if (isset($manyToManyElement->{'index-by'})) {
throw new \InvalidArgumentException("<index-by /> is not a valid tag");
}
@ -617,7 +617,7 @@ class XmlDriver extends FileDriver
// Evaluate <lifecycle-callbacks...>
if (isset($xmlRoot->{'lifecycle-callbacks'})) {
foreach ($xmlRoot->{'lifecycle-callbacks'}->{'lifecycle-callback'} as $lifecycleCallback) {
$metadata->addLifecycleCallback((string)$lifecycleCallback['method'], constant('Doctrine\ORM\Events::' . (string)$lifecycleCallback['type']));
$metadata->addLifecycleCallback((string) $lifecycleCallback['method'], constant('Doctrine\ORM\Events::' . (string) $lifecycleCallback['type']));
}
}
@ -626,7 +626,7 @@ class XmlDriver extends FileDriver
foreach ($xmlRoot->{'entity-listeners'}->{'entity-listener'} as $listenerElement) {
$className = (string) $listenerElement['class'];
// Evaluate the listener using naming convention.
if($listenerElement->count() === 0) {
if ($listenerElement->count() === 0) {
EntityListenerBuilder::bindEntityListener($metadata, $className);
continue;
@ -684,8 +684,8 @@ class XmlDriver extends FileDriver
private function joinColumnToArray(SimpleXMLElement $joinColumnElement)
{
$joinColumn = array(
'name' => (string)$joinColumnElement['name'],
'referencedColumnName' => (string)$joinColumnElement['referenced-column-name']
'name' => (string) $joinColumnElement['name'],
'referencedColumnName' => (string) $joinColumnElement['referenced-column-name']
);
if (isset($joinColumnElement['unique'])) {
@ -697,11 +697,11 @@ class XmlDriver extends FileDriver
}
if (isset($joinColumnElement['on-delete'])) {
$joinColumn['onDelete'] = (string)$joinColumnElement['on-delete'];
$joinColumn['onDelete'] = (string) $joinColumnElement['on-delete'];
}
if (isset($joinColumnElement['column-definition'])) {
$joinColumn['columnDefinition'] = (string)$joinColumnElement['column-definition'];
$joinColumn['columnDefinition'] = (string) $joinColumnElement['column-definition'];
}
return $joinColumn;
@ -808,6 +808,7 @@ class XmlDriver extends FileDriver
// anything about the supported cascading actions
$cascades[] = str_replace('cascade-', '', $action->getName());
}
return $cascades;
}
@ -821,12 +822,12 @@ class XmlDriver extends FileDriver
if (isset($xmlElement->entity)) {
foreach ($xmlElement->entity as $entityElement) {
$entityName = (string)$entityElement['name'];
$entityName = (string) $entityElement['name'];
$result[$entityName] = $entityElement;
}
} else if (isset($xmlElement->{'mapped-superclass'})) {
foreach ($xmlElement->{'mapped-superclass'} as $mappedSuperClass) {
$className = (string)$mappedSuperClass['name'];
$className = (string) $mappedSuperClass['name'];
$result[$className] = $mappedSuperClass;
}
} else if (isset($xmlElement->embeddable)) {
@ -846,7 +847,7 @@ class XmlDriver extends FileDriver
*/
protected function evaluateBoolean($element)
{
$flag = (string)$element;
$flag = (string) $element;
return ($flag == "true" || $flag == "1");
}

18
lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php
View File

@ -175,10 +175,10 @@ class YamlDriver extends FileDriver
if (isset($element['discriminatorColumn'])) {
$discrColumn = $element['discriminatorColumn'];
$metadata->setDiscriminatorColumn(array(
'name' => isset($discrColumn['name']) ? (string)$discrColumn['name'] : null,
'type' => isset($discrColumn['type']) ? (string)$discrColumn['type'] : null,
'length' => isset($discrColumn['length']) ? (string)$discrColumn['length'] : null,
'columnDefinition' => isset($discrColumn['columnDefinition']) ? (string)$discrColumn['columnDefinition'] : null
'name' => isset($discrColumn['name']) ? (string) $discrColumn['name'] : null,
'type' => isset($discrColumn['type']) ? (string) $discrColumn['type'] : null,
'length' => isset($discrColumn['length']) ? (string) $discrColumn['length'] : null,
'columnDefinition' => isset($discrColumn['columnDefinition']) ? (string) $discrColumn['columnDefinition'] : null
));
} else {
$metadata->setDiscriminatorColumn(array('name' => 'dtype', 'type' => 'string', 'length' => 255));
@ -385,7 +385,7 @@ class YamlDriver extends FileDriver
}
if (isset($oneToOneElement['orphanRemoval'])) {
$mapping['orphanRemoval'] = (bool)$oneToOneElement['orphanRemoval'];
$mapping['orphanRemoval'] = (bool) $oneToOneElement['orphanRemoval'];
}
// Evaluate second level cache
@ -415,7 +415,7 @@ class YamlDriver extends FileDriver
}
if (isset($oneToManyElement['orphanRemoval'])) {
$mapping['orphanRemoval'] = (bool)$oneToManyElement['orphanRemoval'];
$mapping['orphanRemoval'] = (bool) $oneToManyElement['orphanRemoval'];
}
if (isset($oneToManyElement['orderBy'])) {
@ -548,7 +548,7 @@ class YamlDriver extends FileDriver
}
if (isset($manyToManyElement['orphanRemoval'])) {
$mapping['orphanRemoval'] = (bool)$manyToManyElement['orphanRemoval'];
$mapping['orphanRemoval'] = (bool) $manyToManyElement['orphanRemoval'];
}
// Evaluate second level cache
@ -646,7 +646,7 @@ class YamlDriver extends FileDriver
continue;
}
foreach ($entityListener as $eventName => $callbackElement){
foreach ($entityListener as $eventName => $callbackElement) {
foreach ($callbackElement as $methodName) {
$metadata->addEntityListener($eventName, $className, $methodName);
}
@ -739,7 +739,7 @@ class YamlDriver extends FileDriver
}
if (isset($column['unique'])) {
$mapping['unique'] = (bool)$column['unique'];
$mapping['unique'] = (bool) $column['unique'];
}
if (isset($column['options'])) {

1
lib/Doctrine/ORM/Mapping/MappingException.php
View File

@ -772,6 +772,7 @@ class MappingException extends \Doctrine\ORM\ORMException
public static function invalidCascadeOption(array $cascades, $className, $propertyName)
{
$cascades = implode(", ", array_map(function ($e) { return "'" . $e . "'"; }, $cascades));
return new self(sprintf(
"You have specified invalid cascade options for %s::$%s: %s; available options: 'remove', 'persist', 'refresh', 'merge', and 'detach'",
$className,

8
lib/Doctrine/ORM/ORMInvalidArgumentException.php
View File

@ -95,10 +95,8 @@ class ORMInvalidArgumentException extends \InvalidArgumentException
. " To solve this issue: Either explicitly call EntityManager#persist()"
. " on this unknown entity or configure cascade persist "
. " this association in the mapping for example @ManyToOne(..,cascade={\"persist\"})."
. (method_exists($entry, '__toString') ?
"":
" If you cannot find out which entity causes the problem"
." implement '" . $assoc['targetEntity'] . "#__toString()' to get a clue."));
. (method_exists($entry, '__toString') ? "": " If you cannot find out which entity causes the problem"
. " implement '" . $assoc['targetEntity'] . "#__toString()' to get a clue."));
}
/**
@ -221,6 +219,6 @@ class ORMInvalidArgumentException extends \InvalidArgumentException
*/
private static function objToStr($obj)
{
return method_exists($obj, '__toString') ? (string)$obj : get_class($obj).'@'.spl_object_hash($obj);
return method_exists($obj, '__toString') ? (string) $obj : get_class($obj).'@'.spl_object_hash($obj);
}
}

1
lib/Doctrine/ORM/OptimisticLockException.php
View File

@ -75,6 +75,7 @@ class OptimisticLockException extends ORMException
{
$expectedLockVersion = ($expectedLockVersion instanceof \DateTime) ? $expectedLockVersion->getTimestamp() : $expectedLockVersion;
$actualLockVersion = ($actualLockVersion instanceof \DateTime) ? $actualLockVersion->getTimestamp() : $actualLockVersion;
return new self("The optimistic lock failed, version " . $expectedLockVersion . " was expected, but is actually ".$actualLockVersion, $entity);
}

1
lib/Doctrine/ORM/Persisters/Entity/BasicEntityPersister.php
View File

@ -2047,6 +2047,7 @@ class BasicEntityPersister implements EntityPersister
}
$sql = implode(' AND ', $filterClauses);
return $sql ? "(" . $sql . ")" : ""; // Wrap again to avoid "X or Y and FilterConditionSQL"
}

1
lib/Doctrine/ORM/Persisters/Entity/EntityPersister.php
View File

@ -78,6 +78,7 @@ interface EntityPersister
* Get the COUNT SQL to count entities (optionally based on a criteria)
*
* @param array|\Doctrine\Common\Collections\Criteria $criteria
*
* @return string
*/
public function getCountSQL($criteria = array());

1
lib/Doctrine/ORM/Persisters/Entity/JoinedSubclassPersister.php
View File

@ -590,6 +590,7 @@ class JoinedSubclassPersister extends AbstractEntityInheritancePersister
/**
* @param string $baseTableAlias
*
* @return string
*/
private function getJoinSql($baseTableAlias)

1
lib/Doctrine/ORM/Query/AST/Functions/BitAndFunction.php
View File

@ -40,6 +40,7 @@ class BitAndFunction extends FunctionNode
public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker)
{
$platform = $sqlWalker->getConnection()->getDatabasePlatform();
return $platform->getBitAndComparisonExpression(
$this->firstArithmetic->dispatch($sqlWalker),
$this->secondArithmetic->dispatch($sqlWalker)

1
lib/Doctrine/ORM/Query/AST/Functions/BitOrFunction.php
View File

@ -40,6 +40,7 @@ class BitOrFunction extends FunctionNode
public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker)
{
$platform = $sqlWalker->getConnection()->getDatabasePlatform();
return $platform->getBitOrComparisonExpression(
$this->firstArithmetic->dispatch($sqlWalker),
$this->secondArithmetic->dispatch($sqlWalker)

2
lib/Doctrine/ORM/Query/AST/Functions/IdentityFunction.php
View File

@ -70,7 +70,7 @@ class IdentityFunction extends FunctionNode
foreach ($assoc['joinColumns'] as $mapping) {
if($mapping['referencedColumnName'] === $field['columnName']) {
if ($mapping['referencedColumnName'] === $field['columnName']) {
$joinColumn = $mapping;
break;

2
lib/Doctrine/ORM/Query/AST/Functions/TrimFunction.php
View File

@ -105,8 +105,6 @@ class TrimFunction extends FunctionNode
}
/**
* @param \Doctrine\ORM\Query\Parser $parser
*
* @return integer
*/
private function getTrimMode()

3
lib/Doctrine/ORM/Query/Expr.php
View File

@ -449,6 +449,7 @@ class Expr
}
}
}
return new Expr\Func($x . ' IN', (array) $y);
}
@ -469,6 +470,7 @@ class Expr
}
}
}
return new Expr\Func($x . ' NOT IN', (array) $y);
}
@ -550,6 +552,7 @@ class Expr
if (null !== $len) {
$args[] = $len;
}
return new Expr\Func('SUBSTRING', $args);
}

6
lib/Doctrine/ORM/Query/Lexer.php
View File

@ -125,7 +125,7 @@ class Lexer extends \Doctrine\Common\Lexer
}
/**
* @inheritdoc
* {@inheritdoc}
*/
protected function getCatchablePatterns()
{
@ -139,7 +139,7 @@ class Lexer extends \Doctrine\Common\Lexer
}
/**
* @inheritdoc
* {@inheritdoc}
*/
protected function getNonCatchablePatterns()
{
@ -147,7 +147,7 @@ class Lexer extends \Doctrine\Common\Lexer
}
/**
* @inheritdoc
* {@inheritdoc}
*/
protected function getType(&$value)
{

10
lib/Doctrine/ORM/Query/Parser.php
View File

@ -637,7 +637,7 @@ class Parser
// If the namespace is not given then assumes the first FROM entity namespace
if (strpos($className, '\\') === false && ! class_exists($className) && strpos($fromClassName, '\\') !== false) {
$namespace = substr($fromClassName, 0 , strrpos($fromClassName, '\\'));
$namespace = substr($fromClassName, 0, strrpos($fromClassName, '\\'));
$fqcn = $namespace . '\\' . $className;
if (class_exists($fqcn)) {
@ -1611,7 +1611,6 @@ class Parser
}
/**
*
* SubselectIdentificationVariableDeclaration ::= IdentificationVariableDeclaration
*
* {Internal note: WARNING: Solution is harder than a bare implementation.
@ -1963,7 +1962,6 @@ class Parser
case $this->isMathOperator($peek):
// :param + u.value
return $this->SimpleArithmeticExpression();
default:
return $this->InputParameter();
}
@ -2669,22 +2667,22 @@ class Parser
switch ($this->lexer->lookahead['type']) {
case Lexer::T_STRING:
$this->match(Lexer::T_STRING);
return new AST\Literal(AST\Literal::STRING, $this->lexer->token['value']);
return new AST\Literal(AST\Literal::STRING, $this->lexer->token['value']);
case Lexer::T_INTEGER:
case Lexer::T_FLOAT:
$this->match(
$this->lexer->isNextToken(Lexer::T_INTEGER) ? Lexer::T_INTEGER : Lexer::T_FLOAT
);
return new AST\Literal(AST\Literal::NUMERIC, $this->lexer->token['value']);
return new AST\Literal(AST\Literal::NUMERIC, $this->lexer->token['value']);
case Lexer::T_TRUE:
case Lexer::T_FALSE:
$this->match(
$this->lexer->isNextToken(Lexer::T_TRUE) ? Lexer::T_TRUE : Lexer::T_FALSE
);
return new AST\Literal(AST\Literal::BOOLEAN, $this->lexer->token['value']);
return new AST\Literal(AST\Literal::BOOLEAN, $this->lexer->token['value']);
default:
$this->syntaxError('Literal');
}

15
lib/Doctrine/ORM/Query/QueryExpressionVisitor.php
View File

@ -147,8 +147,8 @@ class QueryExpressionVisitor extends ExpressionVisitor
$parameterName = str_replace('.', '_', $comparison->getField());
foreach($this->parameters as $parameter) {
if($parameter->getName() === $parameterName) {
foreach ($this->parameters as $parameter) {
if ($parameter->getName() === $parameterName) {
$parameterName .= '_' . count($this->parameters);
break;
}
@ -160,36 +160,37 @@ class QueryExpressionVisitor extends ExpressionVisitor
switch ($comparison->getOperator()) {
case Comparison::IN:
$this->parameters[] = $parameter;
return $this->expr->in($field, $placeholder);
return $this->expr->in($field, $placeholder);
case Comparison::NIN:
$this->parameters[] = $parameter;
return $this->expr->notIn($field, $placeholder);
return $this->expr->notIn($field, $placeholder);
case Comparison::EQ:
case Comparison::IS:
if ($this->walkValue($comparison->getValue()) === null) {
return $this->expr->isNull($field);
}
$this->parameters[] = $parameter;
return $this->expr->eq($field, $placeholder);
return $this->expr->eq($field, $placeholder);
case Comparison::NEQ:
if ($this->walkValue($comparison->getValue()) === null) {
return $this->expr->isNotNull($field);
}
$this->parameters[] = $parameter;
return $this->expr->neq($field, $placeholder);
return $this->expr->neq($field, $placeholder);
case Comparison::CONTAINS:
$parameter->setValue('%' . $parameter->getValue() . '%', $parameter->getType());
$this->parameters[] = $parameter;
return $this->expr->like($field, $placeholder);
return $this->expr->like($field, $placeholder);
default:
$operator = self::convertComparisonOperator($comparison->getOperator());
if ($operator) {
$this->parameters[] = $parameter;
return new Expr\Comparison(
$field,
$operator,

2
lib/Doctrine/ORM/Query/ResultSetMappingBuilder.php
View File

@ -408,7 +408,7 @@ class ResultSetMappingBuilder extends ResultSetMapping
$this->addFieldResult($alias, $field['column'], $fieldName, $classMetadata->name);
}
} else {
if( ! isset($classMetadata->fieldMappings[$fieldName])) {
if ( ! isset($classMetadata->fieldMappings[$fieldName])) {
throw new \InvalidArgumentException("Entity '".$classMetadata->name."' has no field '".$fieldName."'. ");
}

2
lib/Doctrine/ORM/Query/SqlWalker.php
View File

@ -917,7 +917,7 @@ class SqlWalker implements TreeWalker
$relation = $this->queryComponents[$joinedDqlAlias]['relation'];
$targetClass = $this->em->getClassMetadata($relation['targetEntity']);
$sourceClass = $this->em->getClassMetadata($relation['sourceEntity']);
$targetTableName = $this->quoteStrategy->getTableName($targetClass,$this->platform);
$targetTableName = $this->quoteStrategy->getTableName($targetClass, $this->platform);
$targetTableAlias = $this->getSQLTableAlias($targetClass->getTableName(), $joinedDqlAlias);
$sourceTableAlias = $this->getSQLTableAlias($sourceClass->getTableName(), $associationPathExpression->identificationVariable);

2
lib/Doctrine/ORM/Query/TreeWalkerAdapter.php
View File

@ -336,7 +336,7 @@ abstract class TreeWalkerAdapter implements TreeWalker
/**
* {@inheritdoc}
*/
function walkInstanceOfExpression($instanceOfExpr)
public function walkInstanceOfExpression($instanceOfExpr)
{
}

2
lib/Doctrine/ORM/Query/TreeWalkerChain.php
View File

@ -429,7 +429,7 @@ class TreeWalkerChain implements TreeWalker
/**
* {@inheritdoc}
*/
function walkInstanceOfExpression($instanceOfExpr)
public function walkInstanceOfExpression($instanceOfExpr)
{
foreach ($this->_walkers as $walker) {
$walker->walkInstanceOfExpression($instanceOfExpr);

10
lib/Doctrine/ORM/Query/TreeWalkerChainIterator.php
View File

@ -51,7 +51,7 @@ class TreeWalkerChainIterator implements \Iterator, \ArrayAccess
/**
* {@inheritdoc}
*/
function rewind()
public function rewind()
{
return reset($this->walkers);
}
@ -59,7 +59,7 @@ class TreeWalkerChainIterator implements \Iterator, \ArrayAccess
/**
* {@inheritdoc}
*/
function current()
public function current()
{
return $this->offsetGet(key($this->walkers));
}
@ -67,7 +67,7 @@ class TreeWalkerChainIterator implements \Iterator, \ArrayAccess
/**
* {@inheritdoc}
*/
function key()
public function key()
{
return key($this->walkers);
}
@ -75,7 +75,7 @@ class TreeWalkerChainIterator implements \Iterator, \ArrayAccess
/**
* {@inheritdoc}
*/
function next()
public function next()
{
next($this->walkers);
@ -85,7 +85,7 @@ class TreeWalkerChainIterator implements \Iterator, \ArrayAccess
/**
* {@inheritdoc}
*/
function valid()
public function valid()
{
return key($this->walkers) !== null;
}

2
lib/Doctrine/ORM/Tools/AttachEntityListenersListener.php
View File

@ -41,7 +41,7 @@ class AttachEntityListenersListener
* @param string $entityClass The entity to attach the listener.
* @param string $listenerClass The listener class.
* @param string $eventName The entity lifecycle event.
* @param string $listenerCallback|null The listener callback method or NULL to use $eventName.
* @param string|null $listenerCallback The listener callback method or NULL to use $eventName.
*
* @return void
*/

2
lib/Doctrine/ORM/Tools/Console/Command/ClearCache/CollectionRegionCommand.php
View File

@ -47,7 +47,7 @@ class CollectionRegionCommand extends Command
->addArgument('association', InputArgument::OPTIONAL, 'The association collection name.')
->addArgument('owner-id', InputArgument::OPTIONAL, 'The owner identifier.')
->addOption('all', null, InputOption::VALUE_NONE, 'If defined, all entity regions will be deleted/invalidated.')
->addOption('flush', null, InputOption::VALUE_NONE,'If defined, all cache entries will be flushed.');
->addOption('flush', null, InputOption::VALUE_NONE, 'If defined, all cache entries will be flushed.');
$this->setHelp(<<<EOT

2
lib/Doctrine/ORM/Tools/Console/Command/ClearCache/EntityRegionCommand.php
View File

@ -46,7 +46,7 @@ class EntityRegionCommand extends Command
->addArgument('entity-class', InputArgument::OPTIONAL, 'The entity name.')
->addArgument('entity-id', InputArgument::OPTIONAL, 'The entity identifier.')
->addOption('all', null, InputOption::VALUE_NONE, 'If defined, all entity regions will be deleted/invalidated.')
->addOption('flush', null, InputOption::VALUE_NONE,'If defined, all cache entries will be flushed.');
->addOption('flush', null, InputOption::VALUE_NONE, 'If defined, all cache entries will be flushed.');
$this->setHelp(<<<EOT

2
lib/Doctrine/ORM/Tools/Console/Command/ClearCache/QueryRegionCommand.php
View File

@ -45,7 +45,7 @@ class QueryRegionCommand extends Command
->setDescription('Clear a second-level cache query region.')
->addArgument('region-name', InputArgument::OPTIONAL, 'The query region to clear.')
->addOption('all', null, InputOption::VALUE_NONE, 'If defined, all query regions will be deleted/invalidated.')
->addOption('flush', null, InputOption::VALUE_NONE,'If defined, all cache entries will be flushed.');
->addOption('flush', null, InputOption::VALUE_NONE, 'If defined, all cache entries will be flushed.');
$this->setHelp(<<<EOT

6
lib/Doctrine/ORM/Tools/Console/Command/GenerateRepositoriesCommand.php
View File

@ -110,12 +110,12 @@ EOT
if ($numRepositories) {
// Outputting information message
$output->writeln(PHP_EOL . sprintf('Repository classes generated to "<info>%s</INFO>"', $destPath) );
$output->writeln(PHP_EOL . sprintf('Repository classes generated to "<info>%s</INFO>"', $destPath));
} else {
$output->writeln('No Repository classes were found to be processed.' );
$output->writeln('No Repository classes were found to be processed.');
}
} else {
$output->writeln('No Metadata Classes to process.' );
$output->writeln('No Metadata Classes to process.');
}
}
}

2
lib/Doctrine/ORM/Tools/Console/Command/MappingDescribeCommand.php
View File

@ -257,7 +257,7 @@ EOT
/**
* Format the association mappings
*
* @param array
* @param array $propertyMappings
*
* @return array
*/

1
lib/Doctrine/ORM/Tools/Console/Command/SchemaTool/AbstractCommand.php
View File

@ -65,6 +65,7 @@ abstract class AbstractCommand extends Command
return $this->executeSchemaCommand($input, $output, $tool, $metadatas);
} else {
$output->writeln('No Metadata Classes to process.');
return 0;
}
}

1
lib/Doctrine/ORM/Tools/DebugUnitOfWorkListener.php
View File

@ -81,6 +81,7 @@ class DebugUnitOfWorkListener
$fh = fopen($this->file, "x+");
if (count($identityMap) == 0) {
fwrite($fh, "Flush Operation [".$this->context."] - Empty identity map.\n");
return;
}

7
lib/Doctrine/ORM/Tools/EntityGenerator.php
View File

@ -1100,6 +1100,7 @@ public function __construct(<params>)
}
$annotations[] = '@' . $this->annotationsPrefix . $constraintName . '(name="' . $name . '", columns={' . implode(', ', $columns) . '})';
}
return implode(', ', $annotations);
}
@ -1241,7 +1242,7 @@ public function __construct(<params>)
}
foreach ($joinColumns as $joinColumn) {
if(isset($joinColumn['nullable']) && !$joinColumn['nullable']) {
if (isset($joinColumn['nullable']) && !$joinColumn['nullable']) {
return false;
}
}
@ -1811,12 +1812,14 @@ public function __construct(<params>)
* Exports (nested) option elements.
*
* @param array $options
*
* @return string
*/
private function exportTableOptions(array $options)
{
$optionsStr = array();
foreach($options as $name => $option) {
foreach ($options as $name => $option) {
if (is_array($option)) {
$optionsStr[] = '"' . $name . '"={' . $this->exportTableOptions($option) . '}';
} else {

2
lib/Doctrine/ORM/Tools/Export/Driver/AbstractExporter.php
View File

@ -135,7 +135,7 @@ abstract class AbstractExporter
foreach ($this->_metadata as $metadata) {
// In case output is returned, write it to a file, skip otherwise
if($output = $this->exportClassMetadata($metadata)){
if ($output = $this->exportClassMetadata($metadata)) {
$path = $this->_generateOutputPath($metadata);
$dir = dirname($path);
if ( ! is_dir($dir)) {

2
lib/Doctrine/ORM/Tools/Export/Driver/XmlExporter.php
View File

@ -108,7 +108,7 @@ class XmlExporter extends AbstractExporter
$indexXml = $indexesXml->addChild('index');
$indexXml->addAttribute('name', $name);
$indexXml->addAttribute('columns', implode(',', $index['columns']));
if(isset($index['flags'])) {
if (isset($index['flags'])) {
$indexXml->addAttribute('flags', implode(',', $index['flags']));
}
}

5
lib/Doctrine/ORM/Tools/Pagination/Paginator.php
View File

@ -110,6 +110,7 @@ class Paginator implements \Countable, \IteratorAggregate
public function setUseOutputWalkers($useOutputWalkers)
{
$this->useOutputWalkers = $useOutputWalkers;
return $this;
}
@ -121,7 +122,7 @@ class Paginator implements \Countable, \IteratorAggregate
if ($this->count === null) {
try {
$this->count = array_sum(array_map('current', $this->getCountQuery()->getScalarResult()));
} catch(NoResultException $e) {
} catch (NoResultException $e) {
$this->count = 0;
}
}
@ -267,7 +268,7 @@ class Paginator implements \Countable, \IteratorAggregate
foreach ($parameters as $key => $parameter) {
$parameterName = $parameter->getName();
if( ! (isset($parameterMappings[$parameterName]) || array_key_exists($parameterName, $parameterMappings))) {
if ( ! (isset($parameterMappings[$parameterName]) || array_key_exists($parameterName, $parameterMappings))) {
unset($parameters[$key]);
}
}

8
lib/Doctrine/ORM/Tools/SchemaTool.php
View File

@ -109,6 +109,7 @@ class SchemaTool
public function getCreateSchemaSql(array $classes)
{
$schema = $this->getSchemaFromMetadata($classes);
return $schema->toSql($this->platform);
}
@ -278,11 +279,11 @@ class SchemaTool
if (isset($class->table['indexes'])) {
foreach ($class->table['indexes'] as $indexName => $indexData) {
if( ! isset($indexData['flags'])) {
if ( ! isset($indexData['flags'])) {
$indexData['flags'] = array();
}
$table->addIndex($indexData['columns'], is_numeric($indexName) ? null : $indexName, (array)$indexData['flags'], isset($indexData['options']) ? $indexData['options'] : array());
$table->addIndex($indexData['columns'], is_numeric($indexName) ? null : $indexName, (array) $indexData['flags'], isset($indexData['options']) ? $indexData['options'] : array());
}
}
@ -622,7 +623,8 @@ class SchemaTool
&$primaryKeyColumns,
&$addedFks,
&$blacklistedFks
) {
)
{
$localColumns = array();
$foreignColumns = array();
$fkOptions = array();

7
lib/Doctrine/ORM/Tools/SchemaValidator.php
View File

@ -97,6 +97,7 @@ class SchemaValidator
foreach ($class->associationMappings as $fieldName => $assoc) {
if (!class_exists($assoc['targetEntity']) || $cmf->isTransient($assoc['targetEntity'])) {
$ce[] = "The target entity '" . $assoc['targetEntity'] . "' specified on " . $class->name . '#' . $fieldName . ' is unknown or not an entity.';
return $ce;
}
@ -154,13 +155,13 @@ class SchemaValidator
// Verify inverse side/owning side match each other
if (array_key_exists($assoc['inversedBy'], $targetMetadata->associationMappings)) {
$targetAssoc = $targetMetadata->associationMappings[$assoc['inversedBy']];
if ($assoc['type'] == ClassMetadataInfo::ONE_TO_ONE && $targetAssoc['type'] !== ClassMetadataInfo::ONE_TO_ONE){
if ($assoc['type'] == ClassMetadataInfo::ONE_TO_ONE && $targetAssoc['type'] !== ClassMetadataInfo::ONE_TO_ONE) {
$ce[] = "If association " . $class->name . "#" . $fieldName . " is one-to-one, then the inversed " .
"side " . $targetMetadata->name . "#" . $assoc['inversedBy'] . " has to be one-to-one as well.";
} elseif ($assoc['type'] == ClassMetadataInfo::MANY_TO_ONE && $targetAssoc['type'] !== ClassMetadataInfo::ONE_TO_MANY){
} elseif ($assoc['type'] == ClassMetadataInfo::MANY_TO_ONE && $targetAssoc['type'] !== ClassMetadataInfo::ONE_TO_MANY) {
$ce[] = "If association " . $class->name . "#" . $fieldName . " is many-to-one, then the inversed " .
"side " . $targetMetadata->name . "#" . $assoc['inversedBy'] . " has to be one-to-many.";
} elseif ($assoc['type'] == ClassMetadataInfo::MANY_TO_MANY && $targetAssoc['type'] !== ClassMetadataInfo::MANY_TO_MANY){
} elseif ($assoc['type'] == ClassMetadataInfo::MANY_TO_MANY && $targetAssoc['type'] !== ClassMetadataInfo::MANY_TO_MANY) {
$ce[] = "If association " . $class->name . "#" . $fieldName . " is many-to-many, then the inversed " .
"side " . $targetMetadata->name . "#" . $assoc['inversedBy'] . " has to be many-to-many as well.";
}

2
lib/Doctrine/ORM/UnitOfWork.php
View File

@ -3224,7 +3224,7 @@ class UnitOfWork implements PropertyChangedListener
*/
private static function objToStr($obj)
{
return method_exists($obj, '__toString') ? (string)$obj : get_class($obj).'@'.spl_object_hash($obj);
return method_exists($obj, '__toString') ? (string) $obj : get_class($obj).'@'.spl_object_hash($obj);
}
/**