added global activities (#259)

src/Repository/Query/ActivityQuery.php

@@ -17,12 +17,58 @@ use App\Entity\Project;
 class ActivityQuery extends ProjectQuery
 {
     /**
-     * @var Project
+     * @var Project|int
      */
     protected $project;
+    /**
+     * @var bool
+     */
+    protected $orderGlobalsFirst = false;
+    /**
+     * @var bool
+     */
+    protected $globalsOnly = false;
 
     /**
-     * @return Project
+     * @return bool
+     */
+    public function isOrderGlobalsFirst(): bool
+    {
+        return $this->orderGlobalsFirst;
+    }
+
+    /**
+     * @param bool $orderGlobalsFirst
+     * @return ActivityQuery
+     */
+    public function setOrderGlobalsFirst(bool $orderGlobalsFirst)
+    {
+        $this->orderGlobalsFirst = $orderGlobalsFirst;
+
+        return $this;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isGlobalsOnly(): bool
+    {
+        return $this->globalsOnly;
+    }
+
+    /**
+     * @param bool $globalsOnly
+     * @return ActivityQuery
+     */
+    public function setGlobalsOnly(bool $globalsOnly)
+    {
+        $this->globalsOnly = $globalsOnly;
+
+        return $this;
+    }
+
+    /**
+     * @return Project|int
      */
     public function getProject()
     {
@@ -30,10 +76,10 @@ class ActivityQuery extends ProjectQuery
     }
 
     /**
-     * @param Project $project
+     * @param Project|int $project
      * @return $this
      */
-    public function setProject(Project $project = null)
+    public function setProject($project = null)
     {
         $this->project = $project;
 

src/Repository/Query/BaseQuery.php

@@ -140,7 +140,7 @@ class BaseQuery
     }
 
     /**
-     * @param string $resultType
+     * @param $resultType
      * @return $this
      * @throws \InvalidArgumentException
      */
@@ -166,7 +166,7 @@ class BaseQuery
     }
 
     /**
-     * @param object $hiddenEntity
+     * @param object|string $hiddenEntity
      * @return BaseQuery
      */
     public function setHiddenEntity($hiddenEntity)

src/Repository/Query/ProjectQuery.php

@@ -17,12 +17,12 @@ use App\Entity\Customer;
 class ProjectQuery extends VisibilityQuery
 {
     /**
-     * @var Customer
+     * @var Customer|int
      */
     protected $customer;
 
     /**
-     * @return Customer
+     * @return Customer|int
      */
     public function getCustomer()
     {
@@ -30,10 +30,10 @@ class ProjectQuery extends VisibilityQuery
     }
 
     /**
-     * @param Customer $customer
+     * @param Customer|int $customer
      * @return $this
      */
-    public function setCustomer(Customer $customer = null)
+    public function setCustomer($customer = null)
     {
         $this->customer = $customer;