merge

intel352 · Mar 9, 2012 · eb5c8f3 · eb5c8f3
2 parents 42fb7e9 + 5bc8a75
commit eb5c8f3
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 19 deletions.
diff --git a/Adapter.php b/Adapter.php
@@ -40,7 +40,7 @@ abstract protected function countInternal(Criteria $criteria);
     /**
      * @abstract
      * @param \ext\activedocument\Criteria $criteria
-     * @return array[]\ext\activedocument\Object
+     * @return \ext\activedocument\Object[]
      */
     abstract protected function findInternal(Criteria $criteria);
 
@@ -160,7 +160,7 @@ public function count(Criteria $criteria) {
 
     /**
      * @param \ext\activedocument\Criteria $criteria
-     * @return array[]\ext\activedocument\Object
+     * @return \ext\activedocument\Object[]
      */
     public function find(Criteria $criteria) {
         if ($this->getConnection()->enableProfiling) {

diff --git a/Container.php b/Container.php
@@ -160,7 +160,7 @@ public function count(Criteria $criteria=null) {
 
     /**
      * @param \ext\activedocument\Criteria|null $criteria optional
-     * @return array[]\ext\activedocument\Object
+     * @return \ext\activedocument\Object[]
      */
     public function find(Criteria $criteria=null) {
         if ($criteria === null)

diff --git a/Document.php b/Document.php
@@ -384,8 +384,8 @@ public function getRelatedKeys($name) {
             if ($relation->nested === true)
                 $pks = array_keys($pks);
             return $pks;
-        } elseif ($obj = $this->getRelated($name)) {
-            return $obj->getEncodedPk();
+        } else {
+            return self::stringify($this->getObject()->data[$name]);
         }
         return null;
     }

diff --git a/Finder.php b/Finder.php
diff --git a/README.md b/README.md
@@ -59,7 +59,7 @@ This quick example uses the Memory driver
      * default attribute validation rules).
      *
      * @property string $name
-     * @property array[]ConfigSetting $options Not needed for ActiveDocument, this exists as helper phpdoc for IDE users
+     * @property ConfigSetting[] $options Not needed for ActiveDocument, this exists as helper phpdoc for IDE users
      */
     class Config extends \ext\activedocument\Document {
 

diff --git a/drivers/memory/Adapter.php b/drivers/memory/Adapter.php
@@ -29,7 +29,7 @@ protected function countInternal(\ext\activedocument\Criteria $criteria) {
 
     /**
      * @param \ext\activedocument\Criteria $criteria
-     * @return array[]\ext\activedocument\drivers\memory\Object
+     * @return \ext\activedocument\drivers\memory\Object[]
      */
     protected function findInternal(\ext\activedocument\Criteria $criteria) {
         $values = $this->applySearchFilters($criteria);

diff --git a/drivers/mongo/Adapter.php b/drivers/mongo/Adapter.php
@@ -71,7 +71,7 @@ protected function countInternal(\ext\activedocument\Criteria $criteria) {
     /**
      * @param \ext\activedocument\Criteria $criteria
      *
-     * @return array[]\ext\activedocument\drivers\mongo\Object
+     * @return \ext\activedocument\drivers\mongo\Object[]
      */
     protected function findInternal(\ext\activedocument\Criteria $criteria) {
         $cursor = $this->applySearchFilters($criteria);

diff --git a/drivers/riak/Adapter.php b/drivers/riak/Adapter.php
@@ -4,7 +4,9 @@
 
 use \Yii;
 
-Yii::setPathOfAlias('riiak', Yii::getPathOfAlias('ext.activedocument.vendors.riiak'));
+if(!Yii::getPathOfAlias('riiak')) {
+    Yii::setPathOfAlias('riiak', Yii::getPathOfAlias('ext.activedocument.vendors.riiak'));
+}
 
 /**
  * @property string $host
@@ -105,7 +107,7 @@ public function getObjectsData($data) {
     /**
      * @param \ext\activedocument\Criteria $criteria
      *
-     * @return array[]\ext\activedocument\drivers\riak\Object
+     * @return \ext\activedocument\drivers\riak\Object[]
      */
     protected function findInternal(\ext\activedocument\Criteria $criteria) {
         $mr = $this->applySearchFilters($criteria);