Skip to content

Commit 4858024

Browse files
committed
Merge branch 'master' into issue/43-dashes-removed-from-group-names
2 parents 98e8c61 + 0fdd389 commit 4858024

File tree

5 files changed

+457
-536
lines changed

5 files changed

+457
-536
lines changed

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,19 +38,19 @@ These instructions will get you a copy of the project up and running on your loc
3838
Requirements for running this tool from a management station:
3939

4040
* Any system that can run PHP-CLI will do. (Even Windows.)
41-
* [PHP](https://www.php.net) version 8.1 or later: Available to most Linux distributions via `apt-get` or `yum`. You don't need anything web related, but you will need the command line interface.
41+
* [PHP](https://www.php.net) version 8.1 or later: Available to most Linux distributions via `apt-get` or `yum`/`dnf`. You don't need anything web related, but you will need the command line interface.
4242
* [PHP's LDAP functions](http://php.net/manual/en/book.ldap.php): Usually installed with PHP as standard, but the LDAP module/functions may not be enabled by default.
43-
* [Composer](https://getcomposer.org/): Available to most Linux distributions via `apt-get` or `yum`, or manually download it as `composer.phar` alongside this tool.
43+
* [Composer](https://getcomposer.org/): Available to most Linux distributions via `apt-get` or `yum`/`dnf`, or manually download it as `composer.phar` alongside this tool.
4444
* LDAP instance: Used for Gitlab's authentication. It can (likely) be Microsoft Active Directory, OpenLDAP, 389-DS (including FreeIPA), and any other LDAP system, though **most of my testing is with 389-DS (without FreeIPA)**.
4545
* [Gitlab community edition](https://about.gitlab.com/install/?version=ce) or [Gitlab community edition](https://about.gitlab.com/install/?version=ee) self-hosted: This must be configured to authenticate against an LDAP instance already.
4646

4747
## Installing
4848

4949
Either checkout this project or download it in ZIP form and extract it somewhere safe. The configuration will later contain an LDAP password and Gitlab API secret keys, so do put some protection in place to ensure only you can access it.
5050

51-
After this you will need to install PHP components delivered via [Composer](https://getcomposer.org/). To do this open a terminal and change the working directory to this tool's location.
51+
After this you will need to install PHP components delivered via [Composer](https://getcomposer.org/). To do this open a terminal and change the working directory to this tool's location. (Or add the `-d`/`--working-dir=` option to run from another working directory.)
5252

53-
* If you have Composer installed as a system-wide application (e.g. via `apt-get` or `yum`) use command `composer install`.
53+
* If you have Composer installed as a system-wide application (e.g. via `apt-get` or `yum`/`dnf`) use command `composer install`.
5454
* If you have Composer manually downloaded residing as `composer.phar` alongside this tool use command `php composer.phar install`.
5555

5656
## Configuration

composer.json

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,20 @@
44
"license": "Apache-2.0",
55
"require": {
66
"php": ">=8.1",
7-
"cocur/slugify": "^4.5",
7+
"cocur/slugify": "^4.6.0",
88
"http-interop/http-factory-guzzle": "^1.2",
9-
"m4tthumphrey/php-gitlab-api": "^11.12",
10-
"monolog/monolog": "^1.27",
11-
"php-http/guzzle6-adapter": "^2.0",
12-
"symfony/console": "^6.3",
13-
"symfony/polyfill-php81": "^1.28",
14-
"symfony/polyfill-php82": "^1.28",
15-
"symfony/polyfill-php83": "^1.28",
16-
"symfony/yaml": "^6.3"
9+
"m4tthumphrey/php-gitlab-api": "^11.14",
10+
"monolog/monolog": "^3.8.1",
11+
"php-http/guzzle6-adapter": "^2.0.2",
12+
"symfony/console": "v6.4.15",
13+
"symfony/polyfill-php82": "^1.31.0",
14+
"symfony/polyfill-php83": "^1.31.0",
15+
"symfony/polyfill-php84": "^1.31.0",
16+
"symfony/yaml": "^6.4.13"
1717
},
1818
"require-dev": {
19-
"phpstan/phpstan": "^1.10",
20-
"phpstan/phpstan-symfony": "^1.3"
19+
"phpstan/phpstan": "^2.0.3",
20+
"phpstan/phpstan-symfony": "^2.0.0"
2121
},
2222
"autoload": {
2323
"psr-4": {

0 commit comments

Comments
 (0)