Commit 44221d46 authored by Sean Madsen's avatar Sean Madsen

Merge branch 'maintenance' into 'master'

Maintenance

See merge request !76
parents 0657c976 a86294be
......@@ -16,7 +16,6 @@ RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local
# xdebug
RUN apk add --update autoconf alpine-sdk
RUN pecl install xdebug
RUN echo 'zend_extension="/usr/local/lib/php/extensions/no-debug-non-zts-20160303/xdebug.so"' > /usr/local/etc/php/conf.d/xdebug.ini
RUN echo xdebug.idekey = PHPSTORM >> /usr/local/etc/php/conf.d/xdebug.ini
......@@ -27,3 +26,5 @@ RUN echo xdebug.remote_host=172.17.0.1 >> /usr/local/etc/php/conf.d/xdebug.ini
RUN rm /etc/nginx/sites-enabled/*
ADD app/config/civicrm-docs.conf /etc/nginx/sites-enabled
WORKDIR /var/www
......@@ -18,7 +18,7 @@
},
"require": {
"php": "^7.0",
"symfony/symfony": "3.0.*",
"symfony/symfony": "^3.0",
"doctrine/orm": "^2.5",
"twig/twig": "^1.33",
"doctrine/doctrine-bundle": "^1.6",
......
This diff is collapsed.
<?php
namespace AppBundle\Tests\Controller;
use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
class NotifyControllerTest extends WebTestCase {
public function testNotify() {
$client = static::createClient();
$crawler = $client->request('GET', '/Notify');
}
}
......@@ -64,6 +64,7 @@ class StringToolsTest extends \PHPUnit_Framework_TestCase
[
'from' => 'foo/bar',
'to' => 'baz/bat',
'type' => 'internal',
]
],
......@@ -72,6 +73,7 @@ class StringToolsTest extends \PHPUnit_Framework_TestCase
[
'from' => 'foo/bar',
'to' => 'baz/bat',
'type' => 'internal',
]
],
......@@ -80,6 +82,7 @@ class StringToolsTest extends \PHPUnit_Framework_TestCase
[
'from' => 'foo///bar',
'to' => 'baz///bat',
'type' => 'internal',
]
],
......@@ -88,6 +91,7 @@ class StringToolsTest extends \PHPUnit_Framework_TestCase
[
'from' => 'foo/bar',
'to' => 'baz/bat',
'type' => 'internal',
]
],
......@@ -111,6 +115,7 @@ class StringToolsTest extends \PHPUnit_Framework_TestCase
[
'from' => 'foo/bar',
'to' => 'baz/bat',
'type' => 'internal',
]
],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment