Pārlūkot izejas kodu

[tool] rename "wrapp" method into "wrap"

gedi 13 gadi atpakaļ
vecāks
revīzija
ad40918daf

+ 4 - 4
lib/Gedmo/Loggable/LoggableListener.php

@@ -130,7 +130,7 @@ class LoggableListener extends MappedEventSubscriber
         $oid = spl_object_hash($object);
         $uow = $om->getUnitOfWork();
         if ($this->pendingLogEntryInserts && array_key_exists($oid, $this->pendingLogEntryInserts)) {
-            $wrapped = AbstractWrapper::wrapp($object, $om);
+            $wrapped = AbstractWrapper::wrap($object, $om);
             $meta = $wrapped->getMetadata();
             $config = $this->getConfiguration($om, $meta->name);
 
@@ -146,7 +146,7 @@ class LoggableListener extends MappedEventSubscriber
             unset($this->pendingLogEntryInserts[$oid]);
         }
         if ($this->pendingRelatedObjects && array_key_exists($oid, $this->pendingRelatedObjects)) {
-            $wrapped = AbstractWrapper::wrapp($object, $om);
+            $wrapped = AbstractWrapper::wrap($object, $om);
             $identifiers = $wrapped->getIdentifier(false);
             foreach ($this->pendingRelatedObjects[$oid] as $props) {
                 $logEntry = $props['log'];
@@ -219,7 +219,7 @@ class LoggableListener extends MappedEventSubscriber
     private function createLogEntry($action, $object, LoggableAdapter $ea)
     {
         $om = $ea->getObjectManager();
-        $wrapped = AbstractWrapper::wrapp($object, $om);
+        $wrapped = AbstractWrapper::wrap($object, $om);
         $meta = $wrapped->getMetadata();
         if ($config = $this->getConfiguration($om, $meta->name)) {
             $logEntryClass = $this->getLogEntryClass($ea, $meta->name);
@@ -246,7 +246,7 @@ class LoggableListener extends MappedEventSubscriber
                     $value = $changes[1];
                     if ($meta->isSingleValuedAssociation($field) && $value) {
                         $oid = spl_object_hash($value);
-                        $wrappedAssoc = AbstractWrapper::wrapp($value, $om);
+                        $wrappedAssoc = AbstractWrapper::wrap($value, $om);
                         $value = $wrappedAssoc->getIdentifier(false);
                         if (!is_array($value) && !$value) {
                             $this->pendingRelatedObjects[$oid][] = array(

+ 1 - 1
lib/Gedmo/Sluggable/Handler/InversedRelativeSlugHandler.php

@@ -89,7 +89,7 @@ class InversedRelativeSlugHandler implements SlugHandlerInterface
         $isInsert = $this->om->getUnitOfWork()->isScheduledForInsert($object);
         if (!$isInsert) {
             $options = $config['handlers'][get_called_class()];
-            $wrapped = AbstractWrapper::wrapp($object, $this->om);
+            $wrapped = AbstractWrapper::wrap($object, $this->om);
             $oldSlug = $wrapped->getPropertyValue($config['slug']);
             $mappedByConfig = $this->sluggable->getConfiguration(
                 $this->om,

+ 2 - 2
lib/Gedmo/Sluggable/Handler/RelativeSlugHandler.php

@@ -148,10 +148,10 @@ class RelativeSlugHandler implements SlugHandlerInterface
             array($text, $separator, $object)
         );
         $result = Urlizer::urlize($result, $separator);
-        $wrapped = AbstractWrapper::wrapp($object, $this->om);
+        $wrapped = AbstractWrapper::wrap($object, $this->om);
         $relation = $wrapped->getPropertyValue($this->usedOptions['relationField']);
         if ($relation) {
-            $wrappedRelation = AbstractWrapper::wrapp($relation, $this->om);
+            $wrappedRelation = AbstractWrapper::wrap($relation, $this->om);
             $slug = $wrappedRelation->getPropertyValue($this->usedOptions['relationSlugField']);
             $result = $slug . $this->usedOptions['separator'] . $result;
         }

+ 3 - 3
lib/Gedmo/Sluggable/Handler/TreeSlugHandler.php

@@ -98,9 +98,9 @@ class TreeSlugHandler implements SlugHandlerInterface
         $this->sluggable->setTransliterator(array($this, 'transliterate'));
         $this->parentSlug = '';
 
-        $wrapped = AbstractWrapper::wrapp($object, $this->om);
+        $wrapped = AbstractWrapper::wrap($object, $this->om);
         if ($parent = $wrapped->getPropertyValue($options['parentRelationField'])) {
-            $parent = AbstractWrapper::wrapp($parent, $this->om);
+            $parent = AbstractWrapper::wrap($parent, $this->om);
             $this->parentSlug = $parent->getPropertyValue($config['slug']);
         }
     }
@@ -130,7 +130,7 @@ class TreeSlugHandler implements SlugHandlerInterface
     {
         if (!$this->isInsert) {
             $options = $config['handlers'][get_called_class()];
-            $wrapped = AbstractWrapper::wrapp($object, $this->om);
+            $wrapped = AbstractWrapper::wrap($object, $this->om);
             $meta = $wrapped->getMetadata();
             $target = $wrapped->getPropertyValue($config['slug']);
             $config['pathSeparator'] = $this->usedPathSeparator;

+ 2 - 2
lib/Gedmo/Sluggable/Mapping/Event/Adapter/ODM.php

@@ -25,7 +25,7 @@ final class ODM extends BaseAdapterODM implements SluggableAdapter
     public function getSimilarSlugs($object, $meta, array $config, $slug)
     {
         $dm = $this->getObjectManager();
-        $wrapped = AbstractWrapper::wrapp($object, $dm);
+        $wrapped = AbstractWrapper::wrap($object, $dm);
         $qb = $dm->createQueryBuilder($config['useObjectClass']);
         if (($identifier = $wrapped->getIdentifier()) && !$meta->isIdentifier($config['slug'])) {
             $qb->field($meta->identifier)->notEqual($identifier);
@@ -84,7 +84,7 @@ final class ODM extends BaseAdapterODM implements SluggableAdapter
     public function replaceInverseRelative($object, array $config, $target, $replacement)
     {
         $dm = $this->getObjectManager();
-        $wrapped = AbstractWrapper::wrapp($object, $dm);
+        $wrapped = AbstractWrapper::wrap($object, $dm);
         $meta = $dm->getClassMetadata($config['useObjectClass']);
         $q = $dm
             ->createQueryBuilder($config['useObjectClass'])

+ 1 - 1
lib/Gedmo/Sluggable/Mapping/Event/Adapter/ORM.php

@@ -25,7 +25,7 @@ final class ORM extends BaseAdapterORM implements SluggableAdapter
     public function getSimilarSlugs($object, $meta, array $config, $slug)
     {
         $em = $this->getObjectManager();
-        $wrapped = AbstractWrapper::wrapp($object, $em);
+        $wrapped = AbstractWrapper::wrap($object, $em);
         $qb = $em->createQueryBuilder();
         $qb->select('rec.' . $config['slug'])
             ->from($config['useObjectClass'], 'rec')

+ 1 - 1
lib/Gedmo/Tool/Wrapper/AbstractWrapper.php

@@ -55,7 +55,7 @@ abstract class AbstractWrapper implements WrapperInterface
      * @param \Doctrine\Common\Persistence\ObjectManager $om
      * @return \Gedmo\Tool\WrapperInterface
      */
-    public static function wrapp($object, ObjectManager $om)
+    public static function wrap($object, ObjectManager $om)
     {
         $oid = spl_object_hash($object);
         if (!isset(self::$wrappedObjectReferences[$oid])) {

+ 3 - 3
lib/Gedmo/Translatable/Mapping/Event/Adapter/ODM.php

@@ -49,7 +49,7 @@ final class ODM extends BaseAdapterODM implements TranslatableAdapter
     public function loadTranslations($object, $translationClass, $locale)
     {
         $dm = $this->getObjectManager();
-        $wrapped = AbstractWrapper::wrapp($object, $dm);
+        $wrapped = AbstractWrapper::wrap($object, $dm);
         $result = array();
 
         if ($this->usesPersonalTranslation($translationClass)) {
@@ -171,7 +171,7 @@ final class ODM extends BaseAdapterODM implements TranslatableAdapter
     public function getTranslationValue($object, $field, $value = false)
     {
         $dm = $this->getObjectManager();
-        $wrapped = AbstractWrapper::wrapp($object, $dm);
+        $wrapped = AbstractWrapper::wrap($object, $dm);
         $meta = $wrapped->getMetadata();
         $mapping = $meta->getFieldMapping($field);
         $type = Type::getType($mapping['type']);
@@ -187,7 +187,7 @@ final class ODM extends BaseAdapterODM implements TranslatableAdapter
     public function setTranslationValue($object, $field, $value)
     {
         $dm = $this->getObjectManager();
-        $wrapped = AbstractWrapper::wrapp($object, $dm);
+        $wrapped = AbstractWrapper::wrap($object, $dm);
         $meta = $wrapped->getMetadata();
         $mapping = $meta->getFieldMapping($field);
         $type = Type::getType($mapping['type']);

+ 3 - 3
lib/Gedmo/Translatable/Mapping/Event/Adapter/ORM.php

@@ -49,7 +49,7 @@ final class ORM extends BaseAdapterORM implements TranslatableAdapter
     public function loadTranslations($object, $translationClass, $locale)
     {
         $em = $this->getObjectManager();
-        $wrapped = AbstractWrapper::wrapp($object, $em);
+        $wrapped = AbstractWrapper::wrap($object, $em);
         $result = array();
         if ($this->usesPersonalTranslation($translationClass)) {
             // first try to load it using collection
@@ -208,7 +208,7 @@ final class ORM extends BaseAdapterORM implements TranslatableAdapter
     public function getTranslationValue($object, $field, $value = false)
     {
         $em = $this->getObjectManager();
-        $wrapped = AbstractWrapper::wrapp($object, $em);
+        $wrapped = AbstractWrapper::wrap($object, $em);
         $meta = $wrapped->getMetadata();
         $type = Type::getType($meta->getTypeOfField($field));
         if ($value === false) {
@@ -223,7 +223,7 @@ final class ORM extends BaseAdapterORM implements TranslatableAdapter
     public function setTranslationValue($object, $field, $value)
     {
         $em = $this->getObjectManager();
-        $wrapped = AbstractWrapper::wrapp($object, $em);
+        $wrapped = AbstractWrapper::wrap($object, $em);
         $meta = $wrapped->getMetadata();
         $type = Type::getType($meta->getTypeOfField($field));
         $value = $type->convertToPHPValue($value, $em->getConnection()->getDatabasePlatform());

+ 3 - 3
lib/Gedmo/Translatable/TranslatableListener.php

@@ -301,7 +301,7 @@ class TranslatableListener extends MappedEventSubscriber
             $meta = $om->getClassMetadata(get_class($object));
             $config = $this->getConfiguration($om, $meta->name);
             if (isset($config['fields'])) {
-                $wrapped = AbstractWrapper::wrapp($object, $om);
+                $wrapped = AbstractWrapper::wrap($object, $om);
                 $transClass = $this->getTranslationClass($ea, $meta->name);
                 $ea->removeAssociatedTranslations($wrapped, $transClass);
             }
@@ -326,7 +326,7 @@ class TranslatableListener extends MappedEventSubscriber
             $oid = spl_object_hash($object);
             if (array_key_exists($oid, $this->pendingTranslationInserts)) {
                 // load the pending translations without key
-                $wrapped = AbstractWrapper::wrapp($object, $om);
+                $wrapped = AbstractWrapper::wrap($object, $om);
                 $objectId = $wrapped->getIdentifier();
                 foreach ($this->pendingTranslationInserts[$oid] as $translation) {
                     $translation->setForeignKey($objectId);
@@ -428,7 +428,7 @@ class TranslatableListener extends MappedEventSubscriber
     private function handleTranslatableObjectUpdate(TranslatableAdapter $ea, $object, $isInsert)
     {
         $om = $ea->getObjectManager();
-        $wrapped = AbstractWrapper::wrapp($object, $om);
+        $wrapped = AbstractWrapper::wrap($object, $om);
         $meta = $wrapped->getMetadata();
         $config = $this->getConfiguration($om, $meta->name);
         // no need cache, metadata is loaded only once in MetadataFactoryClass

+ 2 - 2
lib/Gedmo/Tree/Strategy/ORM/Closure.php

@@ -261,7 +261,7 @@ class Closure implements Strategy
      */
     public function updateNode(EntityManager $em, $node, $oldParent)
     {
-        $wrapped = AbstractWrapper::wrapp($node, $em);
+        $wrapped = AbstractWrapper::wrap($node, $em);
         $meta = $wrapped->getMetadata();
         $config = $this->listener->getConfiguration($em, $meta->name);
         $closureMeta = $em->getClassMetadata($config['closure']);
@@ -300,7 +300,7 @@ class Closure implements Strategy
             }
         }
         if ($parent) {
-            $wrappedParent = AbstractWrapper::wrapp($parent, $em);
+            $wrappedParent = AbstractWrapper::wrap($parent, $em);
             $parentId = $wrappedParent->getIdentifier();
             $query = "SELECT c1.ancestor, c2.descendant, (c1.depth + c2.depth + 1) AS depth";
             $query .= " FROM {$table} c1, {$table} c2";

+ 5 - 5
lib/Gedmo/Tree/Strategy/ORM/Nested.php

@@ -141,7 +141,7 @@ class Nested implements Strategy
 
         $oid = spl_object_hash($node);
         if (isset($changeSet[$config['left']]) && isset($this->nodePositions[$oid])) {
-            $wrapped = AbstractWrapper::wrapp($node, $em);
+            $wrapped = AbstractWrapper::wrap($node, $em);
             $parent = $wrapped->getPropertyValue($config['parent']);
             // revert simulated changeset
             $uow->clearEntityChangeSet($oid);
@@ -181,7 +181,7 @@ class Nested implements Strategy
         $config = $this->listener->getConfiguration($em, $meta->name);
         $uow = $em->getUnitOfWork();
 
-        $wrapped = AbstractWrapper::wrapp($node, $em);
+        $wrapped = AbstractWrapper::wrap($node, $em);
         $leftValue = $wrapped->getPropertyValue($config['left']);
         $rightValue = $wrapped->getPropertyValue($config['right']);
 
@@ -249,7 +249,7 @@ class Nested implements Strategy
      */
     public function updateNode(EntityManager $em, $node, $parent, $position = 'FirstChild')
     {
-        $wrapped = AbstractWrapper::wrapp($node, $em);
+        $wrapped = AbstractWrapper::wrap($node, $em);
         $meta = $wrapped->getMetadata();
         $config = $this->listener->getConfiguration($em, $meta->name);
 
@@ -274,7 +274,7 @@ class Nested implements Strategy
         $treeSize = $right - $left + 1;
         $newRootId = null;
         if ($parent) {
-            $wrappedParent = AbstractWrapper::wrapp($parent, $em);
+            $wrappedParent = AbstractWrapper::wrap($parent, $em);
 
             $parentRootId = isset($config['root']) ? $wrappedParent->getPropertyValue($config['root']) : null;
             $parentLeft = $wrappedParent->getPropertyValue($config['left']);
@@ -365,7 +365,7 @@ class Nested implements Strategy
                 $em->getUnitOfWork()->setOriginalEntityProperty($oid, $config['level'], $level);
             }
             if (isset($newParent)) {
-                $wrappedNewParent = AbstractWrapper::wrapp($newParent, $em);
+                $wrappedNewParent = AbstractWrapper::wrap($newParent, $em);
                 $newParentId = $wrappedNewParent->getIdentifier();
                 $qb->set('node.' . $config['parent'], $newParentId);
                 $wrapped->setPropertyValue($config['parent'], $newParent);