Skip to content

Commit

Permalink
Merge pull request #10 from JeromeGillard/9-fof-upload-incompatibility
Browse files Browse the repository at this point in the history
bump to fof/upload:1.4.7, flarum/core:1.8.3, fix template() signature
  • Loading branch information
JeromeGillard authored Nov 15, 2023
2 parents 075d31d + 63af716 commit 467b190
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -151,11 +151,11 @@ out skel qt;

## Development

I've prepared a all-in-one `docker-compose` file to get up and running to develop this Flarum extension easily.
I've prepared a all-in-one `docker-compose.yml` file to get up and running to develop this Flarum extension easily.

### Prepare the environment
1. create the `flarum-dev.env.local` file. There's an example just nearby.
1. Spin the containers: `docker-compose up -d`
1. Spin the containers: `docker compose up -d`
1. Enter the container: `docker exec -it -w /flarum/app flarum-dev /bin/sh`
1. Allow local packages sources: `composer config repositories.0 path "packages/*"`
1. Install the extension: `composer require jeromegillard/map *@dev`
Expand Down
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
],
"type": "flarum-extension",
"require": {
"flarum/core": "^1.2.0",
"fof/upload": "^1.2.3",
"flarum/bbcode": "^1.3.0"
"flarum/core": "^1.8.3",
"fof/upload": "^1.4.7",
"flarum/bbcode": "^1.8.0"
},
"autoload": {
"psr-4": {
Expand Down
3 changes: 2 additions & 1 deletion src/Templates/MapTemplate.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
namespace JeromeGillard\FlarumMap\Templates;

use FoF\Upload\Templates\AbstractTextFormatterTemplate;
use Illuminate\Contracts\View\View;

/*
* This class handles the fof-upload formatter
Expand Down Expand Up @@ -37,7 +38,7 @@ public function description(): string
*
* @return string
*/
public function template(): string
public function template(): View
{
return $this->getView('fof-upload.templates::jeromegillard-map');
}
Expand Down

0 comments on commit 467b190

Please sign in to comment.