Merge branch 'release/6'

.travis.yml

@@ -1,14 +1,15 @@
 matrix:
   include:
-    # FIXME: skipped for now since we use a different php version on the live server
-    # - language: php
-    #   php: 7.0
-    #   cache:
-    #     directories: src/vendor
-    #   before_script:
-    #     - composer install --dev --prefer-dist
-    #   script:
-    #     - sh bin/build.sh
+    - language: php
+      php:
+        - 7.1
+      cache:
+        directories: src/vendor
+      before_script:
+        - composer install --dev --prefer-dist
+      script:
+        - sh bin/build.sh
+        - ./src/vendor/bin/phpunit
     - language: node_js
       node_js: 10
       cache: yarn

CHANGELOG.md

@@ -2,11 +2,21 @@
 
 All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+## [Build 6] - 2019-01-14
+
+### Added
+
+- Add unit tests based on PHPUnit ([#824](https://github.com/serlo-org/athene2/pull/824))
+  - Add yarn script `unit` that executes `./src/vendor/bin/phpunit`
+- Pass CSRF token down
+- Verify ReCAPTCHA tokens on server
+- Specify Sentry release
+
 ## [Build 5] - 2018-12-01
 
 ### Added
 
-- Add meta title to courses (([#814](https://github.com/serlo-org/athene2/pull/814)))
+- Add meta title to courses ([#814](https://github.com/serlo-org/athene2/pull/814))
 - Add share option to exercises ([#815](https://github.com/serlo-org/athene2/pull/815))
 - Add Sentry to monitor PHP runtime errors ([#816](https://github.com/serlo-org/athene2/pull/816))
 - Add versionized privacy policies ([#821](https://github.com/serlo-org/athene2/pull/821))
@@ -59,7 +69,7 @@ All notable changes to this project will be documented in this file. The format
 - Make list of unrevised revisions (e.g. https://de.serlo.org/mathe/entity/unrevised) faster ([#790](https://github.com/serlo-org/athene2/pull/790), [#780](https://github.com/serlo-org/athene2/pull/780))
 - Show all unrevised revisions of an entity (and not only the newest one) ([#790](https://github.com/serlo-org/athene2/pull/790))
 - Show a subject-specific Open Graph meta image (e.g. for Facebook previews) ([#678](https://github.com/serlo-org/athene2/pull/678))
-- Expose a tenant-spefiic Open Search description file ([#678](https://github.com/serlo-org/athene2/pull/678))
+- Expose a tenant-specific Open Search description file ([#678](https://github.com/serlo-org/athene2/pull/678))
 - Link to new "Nachhaltigkeit" starting page ([#796](https://github.com/serlo-org/athene2/pull/796))
 - Rename `*.php.dist` files to `*.dist.php` for better IDE support ([#801](https://github.com/serlo-org/athene2/pull/801))
 - Improve performance of Docker Volumes on macOS ([#801](https://github.com/serlo-org/athene2/pull/801))
@@ -103,7 +113,8 @@ This release uses athene2-assets@3 (blue) ([Changelog](https://github.com/serlo-
 
 ## [Build 1] - 2017-10-05
 
-[unreleased]: https://github.com/serlo-org/athene2/compare/5...HEAD
+[unreleased]: https://github.com/serlo-org/athene2/compare/6...HEAD
+[build 6]: https://github.com/serlo-org/athene2/compare/5...6
 [build 5]: https://github.com/serlo-org/athene2/compare/4...5
 [build 4]: https://github.com/serlo-org/athene2/compare/3...4
 [build 3]: https://github.com/serlo-org/athene2/compare/2...3

README.md

@@ -1,6 +1,8 @@
+<img src="https://assets.serlo.org/meta/logo.png" alt="Serlo logo" title="Serlo" align="right" height="60" />
+
 # Athene2
 
-[![Build status](https://img.shields.io/travis/com/serlo-org/athene2.svg)](https://travis-ci.com/serlo-org/athene2) [![Kanban board](https://img.shields.io/badge/Kanban-board-brightgreen.svg)](https://github.com/orgs/serlo-org/projects/1)
+[![Build status](https://img.shields.io/travis/com/serlo/athene2/development.svg)](https://travis-ci.com/serlo/athene2) [![Kanban board](https://img.shields.io/badge/Kanban-board-brightgreen.svg)](https://github.com/orgs/serlo/projects/1)
 
 <!-- START doctoc generated TOC please keep comment here to allow auto update -->
 <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
@@ -31,7 +33,7 @@ Now follow the upcoming instructions.
 
 ```sh
 # Clone the project:
-$ git clone https://github.com/serlo-org/athene2.git
+$ git clone https://github.com/serlo/athene2.git
 $ cd athene2
 ```
 
@@ -152,10 +154,10 @@ a different browser.
 
 Development is straight forward, make your changes to the php files and then reload the browser. Done!
 
-If you want to modify the assets (e.g. `.css`, `.js` files), you will also have to clone and set up https://github.com/serlo-org/athene2-assets. Before that, make sure you have [yarn](https://yarnpkg.com/en/docs/install) installed:
+If you want to modify the assets (e.g. `.css`, `.js` files), you will also have to clone and set up https://github.com/serlo/athene2-assets. Before that, make sure you have [yarn](https://yarnpkg.com/en/docs/install) installed:
 
 ```sh
-$ git clone https://github.com/serlo-org/athene2-assets
+$ git clone https://github.com/serlo/athene2-assets
 $ cd athene2-assets
 $ yarn
 $ yarn start
@@ -200,7 +202,8 @@ Open _package.json_ and make sure the values you got from running the two comman
 
 Most of these are outdated:
 
-- [Knowledge base](https://github.com/serlo-org/athene2/wiki/Knowledge-base)
-- [Development workflow (outdated)](https://github.com/serlo-org/athene2/wiki/Development-workflow)
-- [Installation (totally outdated, do not look at this)](https://github.com/serlo-org/athene2/wiki/Installation)
-- [Athene2 Guide (somewhat outdated)](https://serlo-org.github.io/athene2-guide/)
+- [Knowledge base](https://github.com/serlo/athene2/wiki/Knowledge-base)
+- [Testing](https://github.com/serlo/athene2/wiki/Testing)
+- [Development workflow (outdated)](https://github.com/serlo/athene2/wiki/Development-workflow)
+- [Installation (totally outdated, do not look at this)](https://github.com/serlo/athene2/wiki/Installation)
+- [Athene2 Guide (somewhat outdated)](https://serlo.github.io/athene2-guide/)

bin/ShortArrayConverter.php

@@ -2,7 +2,7 @@
 /**
  * This file is part of Athene2.
  *
- * Copyright (c) 2013-2018 Serlo Education e.V.
+ * Copyright (c) 2013-2019 Serlo Education e.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License")
  * you may not use this file except in compliance with the License
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  *
- * @copyright Copyright (c) 2013-2018 Serlo Education e.V.
+ * @copyright Copyright (c) 2013-2019 Serlo Education e.V.
  * @license   http://www.apache.org/licenses/LICENSE-2.0 Apache License 2.0
  * @link      https://github.com/serlo-org/athene2 for the canonical source repository
  */

composer.json

@@ -33,5 +33,8 @@
   },
   "config": {
     "vendor-dir": "src/vendor"
+  },
+  "require-dev": {
+    "phpunit/phpunit": "^5"
   }
 }