Skip to content

Commit

Permalink
Merge pull request #33 from salsadigitalauorg/develop
Browse files Browse the repository at this point in the history
v0.3.0 release
  • Loading branch information
SRowlands authored Sep 3, 2019
2 parents ec923ed + d044d41 commit d944c25
Show file tree
Hide file tree
Showing 94 changed files with 7,264 additions and 705 deletions.
11 changes: 9 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#
# Check https://circleci.com/docs/2.0/language-php/ for more details
#
version: 2
version: 2.0
jobs:
build:
docker:
Expand All @@ -12,8 +12,14 @@ jobs:
steps:
- checkout

- run:
name: Install puppeteer with chromium
command: |
npm i puppeteer
- run: sudo apt update
- run: sudo docker-php-ext-install zip
- run: sudo docker-php-ext-install exif && sudo docker-php-ext-enable exif

# Download and cache dependencies

Expand All @@ -33,7 +39,7 @@ jobs:
- vendor

- run: ./vendor/bin/phpunit
- run: ./vendor/bin/phpcs ./
- run: ./vendor/bin/phpcs ./src

deploy:
docker:
Expand All @@ -45,6 +51,7 @@ jobs:
- run: sudo apt-get install golang-go
- run: sudo docker-php-ext-install zip
- run: sudo docker-php-ext-install bcmath && sudo docker-php-ext-enable bcmath
- run: sudo docker-php-ext-install exif && sudo docker-php-ext-enable exif

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

Expand Down
23 changes: 23 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
---
name: Bug report
about: Create a report to help us improve
title: ''
labels: bug
assignees: ''

---

**Describe the bug**
A clear and concise description of what the bug is.

**Sample configuration**
Provide the configuration that caused the bug.

**Expected behavior**
A clear and concise description of what you expected to happen.

**Screenshots**
If applicable, add screenshots to help explain your problem.

**Additional context**
Add any other context about the problem here.
17 changes: 17 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
---
name: Feature request
about: Suggest an idea for this project
title: ''
labels: ''
assignees: ''

---

**Description**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]

**Proposed solution**
A clear and concise description of what you want to happen.

**Additional context**
Add any other context or screenshots about the feature request here.
39 changes: 39 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
# Contributing to Merlin Framework

Thanks for taking the time to contribute!

#### Table of contents

[How can I contribute?](#how-can-i-contribute)
* [Reporting bugs](#reporting-bugs)
* [Before submitting a bug report](#before-submitting-a-bug-report)
* [What makes a good bug report?](#what-makes-a-good-bug-report)
* [Suggesting enhancements](#suggesting-enhancements)
* [Your first code contribution](#your-first-code-contribution)
* [Pull requests](#pull-requests)

## How can I contribute?

### Reporting bugs

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.

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.

>>> **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.
#### Before submitting a bug report

* **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.

#### What makes a good bug report?

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:

* **Use a clear and descriptive title** for the issue to identify the problem.
* **Provide the configuration that caused the problem** as this will allow the maintainers to quickly dive into the issue and find the cause.
* **Describe the behaviour observed** and point out exactly what the problems with that behaviour.
* **Explain what behaviour is expected**.
* **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.


8 changes: 8 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# Merlin

Welcome to Merlin a simple tool to aid content migration from an arbitrary source to a structured format ready for consumption by another system.

## Requirements

- PHP > 7.2
- Composer
14 changes: 9 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,18 @@
}
],
"require": {
"symfony/yaml": "^4.2",
"symfony/yaml": "~4.2.0",
"mustangostang/spyc": "^0.6.2",
"chuyskywalker/rolling-curl": "^3.1",
"symfony/dom-crawler": "^4.2",
"symfony/css-selector": "^4.2",
"symfony/dom-crawler": "~4.2.0",
"symfony/css-selector": "~4.2.0",
"masterminds/html5": "^2.5",
"symfony/console": "^4.2",
"ramsey/uuid": "^3.8"
"symfony/console": "~4.2.0",
"ramsey/uuid": "^3.8",
"spatie/crawler": "^4.4",
"consolidation/comments": "^1.0",
"spatie/browsershot": "^3.32",
"php-curl-class/php-curl-class": "^8.6"
},
"require-dev": {
"phpunit/phpunit": "^7.5",
Expand Down
Loading

0 comments on commit d944c25

Please sign in to comment.