Skip to content

Commit d944c25

Browse files
authored
Merge pull request #33 from salsadigitalauorg/develop
v0.3.0 release
2 parents ec923ed + d044d41 commit d944c25

File tree

94 files changed

+7264
-705
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+7264
-705
lines changed

.circleci/config.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
# Check https://circleci.com/docs/2.0/language-php/ for more details
44
#
5-
version: 2
5+
version: 2.0
66
jobs:
77
build:
88
docker:
@@ -12,8 +12,14 @@ jobs:
1212
steps:
1313
- checkout
1414

15+
- run:
16+
name: Install puppeteer with chromium
17+
command: |
18+
npm i puppeteer
19+
1520
- run: sudo apt update
1621
- run: sudo docker-php-ext-install zip
22+
- run: sudo docker-php-ext-install exif && sudo docker-php-ext-enable exif
1723

1824
# Download and cache dependencies
1925

@@ -33,7 +39,7 @@ jobs:
3339
- vendor
3440

3541
- run: ./vendor/bin/phpunit
36-
- run: ./vendor/bin/phpcs ./
42+
- run: ./vendor/bin/phpcs ./src
3743

3844
deploy:
3945
docker:
@@ -45,6 +51,7 @@ jobs:
4551
- run: sudo apt-get install golang-go
4652
- run: sudo docker-php-ext-install zip
4753
- run: sudo docker-php-ext-install bcmath && sudo docker-php-ext-enable bcmath
54+
- run: sudo docker-php-ext-install exif && sudo docker-php-ext-enable exif
4855

4956
- run: composer install -n --no-dev --prefer-dist
5057

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
---
2+
name: Bug report
3+
about: Create a report to help us improve
4+
title: ''
5+
labels: bug
6+
assignees: ''
7+
8+
---
9+
10+
**Describe the bug**
11+
A clear and concise description of what the bug is.
12+
13+
**Sample configuration**
14+
Provide the configuration that caused the bug.
15+
16+
**Expected behavior**
17+
A clear and concise description of what you expected to happen.
18+
19+
**Screenshots**
20+
If applicable, add screenshots to help explain your problem.
21+
22+
**Additional context**
23+
Add any other context about the problem here.
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
---
2+
name: Feature request
3+
about: Suggest an idea for this project
4+
title: ''
5+
labels: ''
6+
assignees: ''
7+
8+
---
9+
10+
**Description**
11+
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
12+
13+
**Proposed solution**
14+
A clear and concise description of what you want to happen.
15+
16+
**Additional context**
17+
Add any other context or screenshots about the feature request here.

CONTRIBUTING.md

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
# Contributing to Merlin Framework
2+
3+
Thanks for taking the time to contribute!
4+
5+
#### Table of contents
6+
7+
[How can I contribute?](#how-can-i-contribute)
8+
* [Reporting bugs](#reporting-bugs)
9+
* [Before submitting a bug report](#before-submitting-a-bug-report)
10+
* [What makes a good bug report?](#what-makes-a-good-bug-report)
11+
* [Suggesting enhancements](#suggesting-enhancements)
12+
* [Your first code contribution](#your-first-code-contribution)
13+
* [Pull requests](#pull-requests)
14+
15+
## How can I contribute?
16+
17+
### Reporting bugs
18+
19+
This section guides you through creating and submitting a bug report. Following these guidelines helps maintainers and the community understand your report, reporoduce the behaviour and fix the problems.
20+
21+
Before creating a bug report, please check [the issue list](https://github.com/salsadigitalauorg/merlin-framework/issues) and make sure that it is not something planned or raised before. When you are creating a bug report, please include as many details as possible and fill out the required template, it will help us resolve issues faster.
22+
23+
>>> **Note**: If you find a closed issue that seems like it is the same as what you're experiencing please open a new issue and include a link to the original issue.
24+
25+
#### Before submitting a bug report
26+
27+
* **Check the issue queue** to see if the problem has been previously reported. If it has and the issue is still open, add a comment to the existing issue instead of opening a new one.
28+
29+
#### What makes a good bug report?
30+
31+
Bugs are tracked using the Github issue queue. When creating a new bug report explain the problem and include as much detail as possible to help maintainers reproduce the problem:
32+
33+
* **Use a clear and descriptive title** for the issue to identify the problem.
34+
* **Provide the configuration that caused the problem** as this will allow the maintainers to quickly dive into the issue and find the cause.
35+
* **Describe the behaviour observed** and point out exactly what the problems with that behaviour.
36+
* **Explain what behaviour is expected**.
37+
* **If the problem wasn't triggered by a specific user acount** describe what you were doing before the problem happened and share as much information as you can.
38+
39+

README.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# Merlin
2+
3+
Welcome to Merlin a simple tool to aid content migration from an arbitrary source to a structured format ready for consumption by another system.
4+
5+
## Requirements
6+
7+
- PHP > 7.2
8+
- Composer

composer.json

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,18 @@
1212
}
1313
],
1414
"require": {
15-
"symfony/yaml": "^4.2",
15+
"symfony/yaml": "~4.2.0",
1616
"mustangostang/spyc": "^0.6.2",
1717
"chuyskywalker/rolling-curl": "^3.1",
18-
"symfony/dom-crawler": "^4.2",
19-
"symfony/css-selector": "^4.2",
18+
"symfony/dom-crawler": "~4.2.0",
19+
"symfony/css-selector": "~4.2.0",
2020
"masterminds/html5": "^2.5",
21-
"symfony/console": "^4.2",
22-
"ramsey/uuid": "^3.8"
21+
"symfony/console": "~4.2.0",
22+
"ramsey/uuid": "^3.8",
23+
"spatie/crawler": "^4.4",
24+
"consolidation/comments": "^1.0",
25+
"spatie/browsershot": "^3.32",
26+
"php-curl-class/php-curl-class": "^8.6"
2327
},
2428
"require-dev": {
2529
"phpunit/phpunit": "^7.5",

0 commit comments

Comments
 (0)