Update project, fix few bugs

symfony-si · May 19, 2017 · 551ee27 · 551ee27
1 parent 6056d09
commit 551ee27
Show file tree

Hide file tree

Showing 11 changed files with 89 additions and 70 deletions.
diff --git a/.docker/app/Dockerfile b/.docker/app/Dockerfile
@@ -1,4 +1,4 @@
-FROM phpearth/php:alpine
+FROM petk/php:alpine
 
 RUN install-php-ext swoole \
     && apk --no-cache add git \

diff --git a/.docker/docker-compose.node.yml b/.docker/docker-compose.node.yml
@@ -2,7 +2,7 @@ version: '3.2'
 
 services:
   node:
-    image: node:7.9-alpine
+    image: node:7.10-alpine
     container_name: node
     volumes:
       - ../:/var/www/html

diff --git a/.dockerignore b/.dockerignore
@@ -0,0 +1,22 @@
+.git
+node_modules
+tests
+var/cache/*
+var/session/*
+var/logs/*
+web/app_dev.php
+web/app.php
+web/config.php
+.dockerignore
+.gitignore
+.scrutinizer.yml
+.travis.yml
+CHANGELOG.md
+CONTRIBUTING.md
+gulpfile.js
+LICENSE
+Makefile
+package.json
+phpunit.xml.dist
+README.md
+yarn.lock
diff --git a/.travis.yml b/.travis.yml
@@ -5,9 +5,11 @@ php:
   - nightly
 
 before_install:
-    - travis_retry composer self-update
+  - travis_retry composer self-update
+  - pecl install swoole
 
 install:
-    - travis_retry composer install --no-interaction --prefer-dist
+  - travis_retry composer install --no-interaction --prefer-dist
 
-script: phpunit
+script:
+  - vendor/bin/phpunit
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,7 +5,15 @@ All notable changes to this project will be documented in this file. This projec
 [Semantic Versioning](http://semver.org/).
 
 
-## [UNREALEASED] 2016-
+## [UNREALEASED] 2017-01-01
+
+### Added
+
+* Upgrade to Symfony 3.2
+* Swoole Extension
+* ...
+
+## [1.1.0] - 2017-05-19
 
 ### Added
 
@@ -15,8 +23,6 @@ All notable changes to this project will be documented in this file. This projec
 * Single AppBundle project structure
 * Gulp for managing web assets
 * [PHP-PM](https://github.com/php-pm)
-* ...
-
 
 ## [1.0.0] - 2016-06-12
 

diff --git a/LICENSE b/LICENSE
@@ -1,9 +1,6 @@
-Symfony.si application
-----------------------
-
 The MIT License (MIT)
 
-Copyright (c) 2013-2017 Peter Kokot
+Copyright (c) 2013-present Peter Kokot
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/app/Resources/views/base.html.twig b/app/Resources/views/base.html.twig
@@ -8,8 +8,8 @@
         <meta name="author" content="Symfony Slovenia">
         <meta property="og:title" content="Symfony and PHP local user group">
         <meta property="og:type" content="article">
-        <meta property="og:url" content="https://symfony.si">
-        <meta property="og:image" content="https://symfony.si/images/header.png">
+        <meta property="og:url" content="{{ app.request.uri }}">
+        <meta property="og:image" content="{% block image %}{{ absolute_url(asset('assets/img/header.png')) }}{% endblock %}">
         <meta property="og:description" content="Symfony and PHP local user group">
         <meta property="og:site_name" content="Symfony Slovenia">
 

diff --git a/composer.json b/composer.json
@@ -7,10 +7,8 @@
     "homepage": "https://symfony.si",
     "authors": [
         {
-            "name": "Peter Kokot",
-            "email": "peterkokot@gmail.com",
-            "homepage": "https://m-m.si",
-            "role": "Developer"
+            "name": "Symfony.si Contributors",
+            "homepage": "https://github.com/symfony-si/symfony.si/graphs/contributors"
         }
     ],
     "autoload": {
@@ -28,21 +26,21 @@
         "doctrine/doctrine-cache-bundle": "^1.2",
         "doctrine/orm": "^2.5",
         "incenteev/composer-parameter-handler": "^2.0",
-        "knplabs/github-api": "^2.3",
-        "mnapoli/front-yaml": "^1.5",
-        "php-earth/swoole-engine": "dev-master",
-        "php-http/guzzle6-adapter": "^1.1",
         "sensio/distribution-bundle": "^5.0",
         "sensio/framework-extra-bundle": "^3.0.2",
-        "symfony-si/conduct": "*",
-        "symfony-si/fig-standards-sl": "*",
-        "symfony-si/symfony-cheatsheet": "*",
-        "symfony-si/symfony-resources": "*",
         "symfony/monolog-bundle": "^3.0.2",
         "symfony/polyfill-apcu": "^1.0",
         "symfony/swiftmailer-bundle": "^2.3.10",
         "symfony/symfony": "3.2.*",
-        "twig/twig": "^1.0||^2.0"
+        "twig/twig": "^1.0||^2.0",
+        "knplabs/github-api": "^2.3",
+        "mnapoli/front-yaml": "^1.5",
+        "php-http/guzzle6-adapter": "^1.1",
+        "php-earth/swoole-engine": "dev-master",
+        "symfony-si/conduct": "*",
+        "symfony-si/fig-standards-sl": "*",
+        "symfony-si/symfony-cheatsheet": "*",
+        "symfony-si/symfony-resources": "*"
     },
     "require-dev": {
         "sensio/generator-bundle": "^3.0",

diff --git a/composer.lock b/composer.lock
diff --git a/var/SymfonyRequirements.php b/var/SymfonyRequirements.php
@@ -633,12 +633,6 @@ function_exists('mb_strlen'),
             'Install and enable the <strong>mbstring</strong> extension.'
         );
 
-        $this->addRecommendation(
-            function_exists('iconv'),
-            'iconv() should be available',
-            'Install and enable the <strong>iconv</strong> extension.'
-        );
-
         $this->addRecommendation(
             function_exists('utf8_decode'),
             'utf8_decode() should be available',

diff --git a/web/config.php b/web/config.php
@@ -11,7 +11,7 @@
  */
 
 if (!isset($_SERVER['HTTP_HOST'])) {
-    exit('This script cannot be run from the CLI. Run it from a browser.');
+    exit("This script cannot be run from the CLI. Run it from a browser.\n");
 }
 
 if (!in_array(@$_SERVER['REMOTE_ADDR'], array(