Revert "Merge branch 'feature/deploy-tokens-and-access-level' into feature/deploy-tokens"

This reverts commit 7d1ab35, reversing
changes made to c2a1307.

Author: dododedodonl

CHANGELOG.md

@@ -5,27 +5,6 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [11.8.0] - 2022-04-24
-
-* Add support for `reviewer_id` and `wip` params in `MergeRequests::all()`
-* Add support for `GroupEpics::issues()`
-* Add support for `Projects::pipelineJobs()` and protected tags
-* Add support for the confidential filter in `Issues:all()`
-* Allow specifying params in `Wiki::showAll()`
-* Allow specifying params in `SystemHooks::create()`
-* Allow `chmod` action and `execute_filemode` attribute
-* Implement group merge requests endpoints
-* Implement event endpoints
-
-[11.8.0]: https://github.com/GitLabPHP/Client/compare/11.7.1...11.8.0
-
-## [11.7.1] - 2022-04-24
-
-* Fixed `GroupsEpic::all()` method
-* Fixed `Projects::createPipeline()` method
-
-[11.7.1]: https://github.com/GitLabPHP/Client/compare/11.7.0...11.7.1
-
 ## [11.7.0] - 2022-01-24
 
 * Dropped PHP 7.2 and 7.3 support

README.md

@@ -28,15 +28,15 @@ This version supports [PHP](https://php.net) 7.4-8.1. To get started, simply req
 ### Standard Installation
 
 ```bash
-$ composer require "m4tthumphrey/php-gitlab-api:^11.8" "guzzlehttp/guzzle:^7.4" "http-interop/http-factory-guzzle:^1.2"
+$ composer require "m4tthumphrey/php-gitlab-api:^11.7" "guzzlehttp/guzzle:^7.4" "http-interop/http-factory-guzzle:^1.2"
 ```
 
 ### Framework Integration
 
 #### Laravel:
 
 ```bash
-$ composer require "graham-campbell/gitlab:^6.1"
+$ composer require "graham-campbell/gitlab:^6.0"
 ```
 
 #### Symfony:

src/Api/AbstractApi.php

@@ -103,11 +103,10 @@ protected function get(string $uri, array $params = [], array $headers = [])
      * @param array<string,mixed>  $params
      * @param array<string,string> $headers
      * @param array<string,string> $files
-     * @param array<string,mixed>  $uriParams
      *
      * @return mixed
      */
-    protected function post(string $uri, array $params = [], array $headers = [], array $files = [], array $uriParams = [])
+    protected function post(string $uri, array $params = [], array $headers = [], array $files = [])
     {
         if (0 < \count($files)) {
             $builder = $this->createMultipartStreamBuilder($params, $files);
@@ -121,7 +120,7 @@ protected function post(string $uri, array $params = [], array $headers = [], ar
             }
         }
 
-        $response = $this->client->getHttpClient()->post(self::prepareUri($uri, $uriParams), $headers, $body);
+        $response = $this->client->getHttpClient()->post(self::prepareUri($uri), $headers, $body);
 
         return ResponseMediator::getContent($response);
     }

src/Api/Groups.php

@@ -19,31 +19,6 @@
 
 class Groups extends AbstractApi
 {
-    /**
-     * @var string
-     */
-    public const STATE_ALL = 'all';
-
-    /**
-     * @var string
-     */
-    public const STATE_MERGED = 'merged';
-
-    /**
-     * @var string
-     */
-    public const STATE_OPENED = 'opened';
-
-    /**
-     * @var string
-     */
-    public const STATE_CLOSED = 'closed';
-
-    /**
-     * @var string
-     */
-    public const STATE_LOCKED = 'locked';
-
     /**
      * @param array $parameters {
      *
@@ -516,108 +491,6 @@ public function removeVariable($group_id, string $key)
         return $this->delete('groups/'.self::encodePath($group_id).'/variables/'.self::encodePath($key));
     }
 
-    /**
-     * @param int|string $group_id
-     * @param array      $parameters {
-     *
-     *     @var int[]              $iids           return the request having the given iid
-     *     @var string             $state          return all merge requests or just those that are opened, closed, or
-     *                                             merged
-     *     @var string             $scope          Return merge requests for the given scope: created-by-me,
-     *                                             assigned-to-me or all (default is created-by-me)
-     *     @var string             $order_by       return requests ordered by created_at or updated_at fields (default is created_at)
-     *     @var string             $sort           return requests sorted in asc or desc order (default is desc)
-     *     @var string             $milestone      return merge requests for a specific milestone
-     *     @var string             $view           if simple, returns the iid, URL, title, description, and basic state of merge request
-     *     @var string             $labels         return merge requests matching a comma separated list of labels
-     *     @var \DateTimeInterface $created_after  return merge requests created after the given time (inclusive)
-     *     @var \DateTimeInterface $created_before return merge requests created before the given time (inclusive)
-     * }
-     *
-     * @return mixed
-     */
-    public function mergeRequests($group_id, array $parameters = [])
-    {
-        $resolver = $this->createOptionsResolver();
-        $datetimeNormalizer = function (Options $resolver, \DateTimeInterface $value): string {
-            return $value->format('c');
-        };
-        $resolver->setDefined('state')
-            ->setAllowedValues('state', [self::STATE_ALL, self::STATE_MERGED, self::STATE_OPENED, self::STATE_CLOSED])
-        ;
-        $resolver->setDefined('order_by')
-            ->setAllowedValues('order_by', ['created_at', 'updated_at'])
-        ;
-        $resolver->setDefined('sort')
-            ->setAllowedValues('sort', ['asc', 'desc'])
-        ;
-        $resolver->setDefined('milestone');
-        $resolver->setDefined('view')
-            ->setAllowedValues('view', ['simple'])
-        ;
-        $resolver->setDefined('labels');
-        $resolver->setDefined('with_labels_details')
-            ->setAllowedTypes('with_labels_details', 'bool')
-        ;
-
-        $resolver->setDefined('created_after')
-            ->setAllowedTypes('created_after', \DateTimeInterface::class)
-            ->setNormalizer('created_after', $datetimeNormalizer)
-        ;
-        $resolver->setDefined('created_before')
-            ->setAllowedTypes('created_before', \DateTimeInterface::class)
-            ->setNormalizer('created_before', $datetimeNormalizer)
-        ;
-
-        $resolver->setDefined('updated_after')
-            ->setAllowedTypes('updated_after', \DateTimeInterface::class)
-            ->setNormalizer('updated_after', $datetimeNormalizer)
-        ;
-        $resolver->setDefined('updated_before')
-            ->setAllowedTypes('updated_before', \DateTimeInterface::class)
-            ->setNormalizer('updated_before', $datetimeNormalizer)
-        ;
-
-        $resolver->setDefined('scope')
-            ->setAllowedValues('scope', ['created_by_me', 'assigned_to_me', 'all'])
-        ;
-        $resolver->setDefined('author_id')
-            ->setAllowedTypes('author_id', 'integer');
-        $resolver->setDefined('author_username');
-
-        $resolver->setDefined('assignee_id')
-            ->setAllowedTypes('assignee_id', 'integer');
-
-        $resolver->setDefined('approver_ids')
-            ->setAllowedTypes('approver_ids', 'array')
-            ->setAllowedValues('approver_ids', function (array $value) {
-                return \count($value) === \count(\array_filter($value, 'is_int'));
-            })
-        ;
-        $resolver->setDefined('non_archived')
-            ->setAllowedTypes('non_archived', 'bool')
-        ;
-        $resolver->setDefined('reviewer_id')
-            ->setAllowedTypes('reviewer_id', 'integer');
-        $resolver->setDefined('reviewer_username');
-        $resolver->setDefined('my_reaction_emoji');
-
-        $resolver->setDefined('search');
-        $resolver->setDefined('source_branch');
-        $resolver->setDefined('target_branch');
-        $resolver->setDefined('with_merge_status_recheck')
-            ->setAllowedTypes('with_merge_status_recheck', 'bool')
-        ;
-        $resolver->setDefined('approved_by_ids')
-            ->setAllowedTypes('approved_by_ids', 'array')
-            ->setAllowedValues('approved_by_ids', function (array $value) {
-                return \count($value) === \count(\array_filter($value, 'is_int'));
-            })
-        ;
-
-        return $this->get('groups/'.self::encodePath($group_id).'/merge_requests', $resolver->resolve($parameters));
-    }
-
     /**
      * @param int|string $group_id
      * @param array      $parameters {

src/Api/GroupsEpics.php

@@ -19,12 +19,7 @@ class GroupsEpics extends AbstractApi
     /**
      * @var string
      */
-    public const STATE_ALL = 'all';
-
-    /**
-     * @var string
-     */
-    public const STATE_OPENED = 'opened';
+    public const STATE_ACTIVE = 'active';
 
     /**
      * @var string
@@ -52,7 +47,7 @@ public function all($group_id, array $parameters = [])
             })
         ;
         $resolver->setDefined('state')
-            ->setAllowedValues('state', [self::STATE_ALL, self::STATE_OPENED, self::STATE_CLOSED])
+            ->setAllowedValues('state', [self::STATE_ACTIVE, self::STATE_CLOSED])
         ;
         $resolver->setDefined('search');
 
@@ -103,15 +98,4 @@ public function remove($group_id, int $epic_id)
     {
         return $this->delete('groups/'.self::encodePath($group_id).'/epics/'.self::encodePath($epic_id));
     }
-
-    /**
-     * @param int|string $group_id
-     * @param int        $epic_iid
-     *
-     * @return mixed
-     */
-    public function issues($group_id, int $epic_iid)
-    {
-        return $this->get('groups/'.self::encodePath($group_id).'/epics/'.self::encodePath($epic_iid).'/issues');
-    }
 }

src/Api/Issues.php

@@ -41,7 +41,6 @@ class Issues extends AbstractApi
      *     @var int[]  $iids                 return only the issues having the given iid
      *     @var string $order_by             return requests ordered by created_at or updated_at fields (default is created_at)
      *     @var string $sort                 return requests sorted in asc or desc order (default is desc)
-     *     @var bool $confidential           filter confidential or public issues
      *     @var string $search               search issues against their title and description
      * }
      *
@@ -484,9 +483,6 @@ protected function createOptionsResolver(): OptionsResolver
         $resolver->setDefined('sort')
             ->setAllowedValues('sort', ['asc', 'desc'])
         ;
-        $resolver->setDefined('confidential')
-            ->setAllowedValues('confidential', [false, true])
-        ;
         $resolver->setDefined('search');
         $resolver->setDefined('created_after');
         $resolver->setDefined('created_before');

src/Api/MergeRequests.php

@@ -61,8 +61,6 @@ class MergeRequests extends AbstractApi
      *     @var string             $labels         return merge requests matching a comma separated list of labels
      *     @var \DateTimeInterface $created_after  return merge requests created after the given time (inclusive)
      *     @var \DateTimeInterface $created_before return merge requests created before the given time (inclusive)
-     *     @var int                $reviewer_id    return merge requests which have the user as a reviewer with the given user id
-     *     @var bool               $wip            return only draft merge requests (true) or only non-draft merge requests (false)
      * }
      *
      * @throws UndefinedOptionsException if an option name is undefined
@@ -138,13 +136,6 @@ public function all($project_id = null, array $parameters = [])
                 return \count($value) === \count(\array_filter($value, 'is_int'));
             })
         ;
-        $resolver->setDefined('reviewer_id')
-            ->setAllowedTypes('reviewer_id', 'integer');
-        $resolver->setDefined('wip')
-            ->setAllowedTypes('wip', 'boolean')
-            ->addNormalizer('wip', static function ($resolver, $wip) {
-                return $wip ? 'yes' : 'no';
-            });
 
         $path = null === $project_id ? 'merge_requests' : $this->getProjectPath($project_id, 'merge_requests');