Skip to content

Commit

Permalink
re-word composer warning
Browse files Browse the repository at this point in the history
  • Loading branch information
kevinpapst committed Nov 12, 2023
1 parent c679f32 commit db8adc5
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 24 deletions.
4 changes: 3 additions & 1 deletion _documentation/ldap.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ In order to use the LDAP authentication module of Kimai, you have to install the
```bash
composer require laminas/laminas-ldap --optimize-autoloader -n
```

If you see an error message like this:
```
laminas/laminas-ldap requires ext-ldap * -> it is missing from your system. Install or enable PHP's ldap extension.
Expand All @@ -28,6 +28,8 @@ you have to install the PHP LDAP extension first:
- or with the PHP version prefixed `apt-get install php8.1-ldap`
- FPM and CLI PHP use different configs, use `php -m` to verify that the module is really loaded

{% include composer-update-warning.html %}

### Activate LDAP authentication

You activate the LDAP authentication by adding the following code to the end of your
Expand Down
15 changes: 15 additions & 0 deletions _includes/composer-update-warning.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<div class="row row-cards row-deck">
<div class="col-md-12">
<div class="card mb-3">
<div class="card-body">
<h4 class="card-title">UPDATE WARNING</h4>
<p>
As this plugin uses composer to install further dependencies, your next update will not work as usual.
Please read this <a href="{% link _documentation/updates.md %}#changed-files">troubleshooting guide</a> how to handle the situation.
After reverting all local changes and updating Kimai, you have to reinstall the composer package.
</p>

</div>
</div>
</div>
</div>
21 changes: 0 additions & 21 deletions _includes/composer-update-warning.md

This file was deleted.

6 changes: 4 additions & 2 deletions _includes/store/helsinkisystems-lexoffice.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,11 @@ Lexoffice plugin for Kimai is a plugin that allows you to automatically create i

This plugin does not need a database table, so there is no installation of the plugin necessary.
To communicate with Lexoffice however, you need to install the Lexoffice-php-sdk composer package:
``` composer require helsinki-systems/lexoffice-php-sdk:dev-master ```
```bash
composer require helsinki-systems/lexoffice-php-sdk:dev-master
```

{% include composer-update-warning.md %}
{% include composer-update-warning.html %}

## Support

Expand Down

0 comments on commit db8adc5

Please sign in to comment.