Erweiterung für Verknüpfungen auf ID-Basis

.gitignore

@@ -1 +1,2 @@
+.idea
 vendor

Visionline/Crm/WebApi/CacheEntry.php

@@ -102,24 +102,17 @@ public function merge(CacheEntry $other)
     return $result;
   }
 
-  /**
-   * Returns the key under which this cache entry can be stored or retrieved.
-   * @return string The key under which this cache entry can be stored or retrieved.
-   */
-  public function getKey()
-  {
-    return CacheEntry::computeKey($this->type, $this->id);
-  }
-
   /**
    * Computes the key under which a cache entry can be stored or retrieved.
    * @param string $type The entity type
    * @param string $id the entity id
+   * @param string $language the language
+   * @param bool $return_ids Whether the cache entry contains IDs instead of values for relation fields
    * @return string The key under which a cache entry can be stored or retrieved.
    */
-  public static function computeKey($type, $id)
+  public static function computeKey($type, $id, $language, $return_ids)
   {
-    return $type . '#' . $id;
+    return $type . '#' . $id . '-' . strtolower($language) . ($return_ids ? '-ids' : '');
   }
 }
 

Visionline/Crm/WebApi/EntityType.php

@@ -41,10 +41,10 @@ class EntityType
 	/**
 	 * Constant for entity-type 'Aktivität'
 	 */
-        const Aktivität = "Aktivität";
+  const Aktivität = "Aktivität";
 
 	/**
 	 * Empty private constructor
 	 */
 	private function __construct() {}
-}
+}

Visionline/Crm/WebApi/FileSaveOperation.php

@@ -116,6 +116,7 @@ protected function getResult()
    * @param int $width The width to which an image should be resized
    * @param int $height The height to which an image should be resized
    * @param string $resizeMode Specifies how an image should be resized
+   * @return bool Whether the file should be downloaded
    * @see \Visionline\Crm\WebApi\FileOperation::shouldDownload()
    */
   protected function shouldDownload(QueryResult $document, $width, $height, $resizeMode)
@@ -178,6 +179,7 @@ protected function shouldDownload(QueryResult $document, $width, $height, $resiz
    * @param string $resizeMode Specifies how an image should be resized
    * @param string $contentType The content type of the file
    * @param string $extension The file extension of the file
+   * @return string The filename
    */
   private function getFilename($id, $width = null, $height = null, $resizeMode = null, $contentType = null, $extension = null)
   {

Visionline/Crm/WebApi/Query.php

@@ -1,8 +1,8 @@
 <?php
-/**
- * Defines the class Query
- * @package pagepackage
- */
+/**
+ * Defines the class Query
+ * @package pagepackage
+ */
 
 namespace Visionline\Crm\WebApi;
 
@@ -79,21 +79,21 @@ public function order($order)
     return $this->addOrder($order);
   }
 
-  /**
-   * Adds an order to the query
-   * @param Order $order The order to add to this query
-   * @return \Visionline\Crm\WebApi\Query A reference to this query.
-   */
-  public function addOrder($order)
-  {
-    array_push($this->orders, $order);
-    return $this;
+  /**
+   * Adds an order to the query
+   * @param Order $order The order to add to this query
+   * @return \Visionline\Crm\WebApi\Query A reference to this query.
+   */
+  public function addOrder($order)
+  {
+    array_push($this->orders, $order);
+    return $this;
   }
 
-  /**
-   * Specifies the index of first result to be retrieved by this query
-   * @param int $first The index of first result to be retrieved by this query
-   * @return \Visionline\Crm\WebApi\Query A reference to this query.
+  /**
+   * Specifies the index of first result to be retrieved by this query
+   * @param int $first The index of first result to be retrieved by this query
+   * @return \Visionline\Crm\WebApi\Query A reference to this query.
    */
   public function first($first)
   {
@@ -145,16 +145,17 @@ public function uniqueResult()
   /**
    * Runs this query by calling result() and returns the specified fields of the matching entities by calling WebApi::get for the query results.
    * @param array $fields An array of strings specifying which fields should be returned. The strings in the array have to be UTF-8 encoded.
-   * @return A two-dimensional array that contains the results. The keys of the first level are
+   * @param bool $return_ids Whether to return ids instead of values for relations
+   * @return array A two-dimensional array that contains the results. The keys of the first level are
    * the ids of the entities. The keys of the second level are the field identifiers and values are
    * the corresponding field values. The field values are UTF-8 encoded strings.
    * @throws \SoapFault if a remote error occurs.
    * @see WebApi::get
    */
-  public function fields(array $fields)
+  public function fields(array $fields, $return_ids = false)
   {
   	$queryResults = $this->result();
-    $fieldResults = $this->webapi->get($this->type, $queryResults, $fields);
+    $fieldResults = $this->webapi->get($this->type, $queryResults, $fields, $return_ids);
 
   	uksort($fieldResults, function($id1, $id2) use ($queryResults) {
   		foreach ($queryResults as $queryResult)

Visionline/Crm/WebApi/RelatedQueryResult.php

@@ -41,4 +41,4 @@ public function init()
       $this->lastModified = strtotime($this->lastModified);
     }
   }
-}
+}