From 551ee279b7bd4817151329fecb92269a461f7de3 Mon Sep 17 00:00:00 2001 From: Peter Kokot Date: Fri, 19 May 2017 13:18:05 +0200 Subject: [PATCH] Update project, fix few bugs --- .docker/app/Dockerfile | 2 +- .docker/docker-compose.node.yml | 2 +- .dockerignore | 22 +++++++++ .travis.yml | 8 ++-- CHANGELOG.md | 12 +++-- LICENSE | 5 +-- app/Resources/views/base.html.twig | 4 +- composer.json | 24 +++++----- composer.lock | 72 +++++++++++++++--------------- var/SymfonyRequirements.php | 6 --- web/config.php | 2 +- 11 files changed, 89 insertions(+), 70 deletions(-) create mode 100644 .dockerignore diff --git a/.docker/app/Dockerfile b/.docker/app/Dockerfile index 7fa13a2..8081501 100644 --- 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 index ff66e90..31448ce 100644 --- 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 new file mode 100644 index 0000000..3e5a2bc --- /dev/null +++ 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 index b42b8cb..fb4f856 100644 --- 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 index 2165ac4..893524a 100644 --- 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 index ca17891..8ca1ac0 100644 --- 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 index 3ef1297..4c1a26e 100644 --- a/app/Resources/views/base.html.twig +++ b/app/Resources/views/base.html.twig @@ -8,8 +8,8 @@ - - + + diff --git a/composer.json b/composer.json index caec5f9..171d7a2 100644 --- 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 index 30a7457..f731df1 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "3e09865b638e5f33112094e6d1dde30c", + "content-hash": "11fb54486b72cf25883742c4efe187d7", "packages": [ { "name": "clue/stream-filter", @@ -1206,16 +1206,16 @@ }, { "name": "knplabs/github-api", - "version": "2.3.0", + "version": "2.4.0", "source": { "type": "git", "url": "https://github.com/KnpLabs/php-github-api.git", - "reference": "4d4a62820d0274c477c1765303f74254cc278097" + "reference": "eba0b92a4e23dd37abd75f99323a1b463b205d77" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/KnpLabs/php-github-api/zipball/4d4a62820d0274c477c1765303f74254cc278097", - "reference": "4d4a62820d0274c477c1765303f74254cc278097", + "url": "https://api.github.com/repos/KnpLabs/php-github-api/zipball/eba0b92a4e23dd37abd75f99323a1b463b205d77", + "reference": "eba0b92a4e23dd37abd75f99323a1b463b205d77", "shasum": "" }, "require": { @@ -1239,7 +1239,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.3.x-dev" + "dev-master": "2.4.x-dev" } }, "autoload": { @@ -1270,7 +1270,7 @@ "gist", "github" ], - "time": "2017-04-18T18:51:11+00:00" + "time": "2017-05-10T13:37:39+00:00" }, { "name": "mnapoli/front-yaml", @@ -1438,12 +1438,12 @@ "source": { "type": "git", "url": "https://github.com/php-earth/swoole-engine.git", - "reference": "3981bd9242a7536bc4e02b0e0260ae9b395c08e0" + "reference": "1dfcec53472b6441e780a7598dea3cf495a98850" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-earth/swoole-engine/zipball/3981bd9242a7536bc4e02b0e0260ae9b395c08e0", - "reference": "3981bd9242a7536bc4e02b0e0260ae9b395c08e0", + "url": "https://api.github.com/repos/php-earth/swoole-engine/zipball/1dfcec53472b6441e780a7598dea3cf495a98850", + "reference": "1dfcec53472b6441e780a7598dea3cf495a98850", "shasum": "" }, "require": { @@ -1474,7 +1474,7 @@ } ], "description": "Event-driven engine for running PHP with Swoole extension.", - "time": "2017-04-28 22:21:51" + "time": "2017-05-19 10:55:24" }, { "name": "php-http/cache-plugin", @@ -2085,16 +2085,16 @@ }, { "name": "sensio/distribution-bundle", - "version": "v5.0.19", + "version": "v5.0.20", "source": { "type": "git", "url": "https://github.com/sensiolabs/SensioDistributionBundle.git", - "reference": "654c4fa3d11448c8005400a244987896243a990a" + "reference": "4b019d4c0bd64438c42e4b6b0726085b409be8d9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/654c4fa3d11448c8005400a244987896243a990a", - "reference": "654c4fa3d11448c8005400a244987896243a990a", + "url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/4b019d4c0bd64438c42e4b6b0726085b409be8d9", + "reference": "4b019d4c0bd64438c42e4b6b0726085b409be8d9", "shasum": "" }, "require": { @@ -2133,20 +2133,20 @@ "configuration", "distribution" ], - "time": "2017-04-23T22:28:23+00:00" + "time": "2017-05-11T16:21:03+00:00" }, { "name": "sensio/framework-extra-bundle", - "version": "v3.0.25", + "version": "v3.0.26", "source": { "type": "git", "url": "https://github.com/sensiolabs/SensioFrameworkExtraBundle.git", - "reference": "472b339cf0c82f3a033b29f85d9d9cada3cd1a9c" + "reference": "6d6cbe971554f0a2cc84965850481eb04a2a0059" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/SensioFrameworkExtraBundle/zipball/472b339cf0c82f3a033b29f85d9d9cada3cd1a9c", - "reference": "472b339cf0c82f3a033b29f85d9d9cada3cd1a9c", + "url": "https://api.github.com/repos/sensiolabs/SensioFrameworkExtraBundle/zipball/6d6cbe971554f0a2cc84965850481eb04a2a0059", + "reference": "6d6cbe971554f0a2cc84965850481eb04a2a0059", "shasum": "" }, "require": { @@ -2203,7 +2203,7 @@ "annotations", "controllers" ], - "time": "2017-03-21T23:34:44+00:00" + "time": "2017-05-11T17:01:57+00:00" }, { "name": "sensiolabs/security-checker", @@ -2252,16 +2252,16 @@ }, { "name": "swiftmailer/swiftmailer", - "version": "v5.4.7", + "version": "v5.4.8", "source": { "type": "git", "url": "https://github.com/swiftmailer/swiftmailer.git", - "reference": "56db4ed32a6d5c9824c3ecc1d2e538f663f47eb4" + "reference": "9a06dc570a0367850280eefd3f1dc2da45aef517" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/56db4ed32a6d5c9824c3ecc1d2e538f663f47eb4", - "reference": "56db4ed32a6d5c9824c3ecc1d2e538f663f47eb4", + "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/9a06dc570a0367850280eefd3f1dc2da45aef517", + "reference": "9a06dc570a0367850280eefd3f1dc2da45aef517", "shasum": "" }, "require": { @@ -2302,7 +2302,7 @@ "mail", "mailer" ], - "time": "2017-04-20T17:32:18+00:00" + "time": "2017-05-01T15:54:03+00:00" }, { "name": "symfony-si/conduct", @@ -2806,16 +2806,16 @@ }, { "name": "symfony/symfony", - "version": "v3.2.7", + "version": "v3.2.8", "source": { "type": "git", "url": "https://github.com/symfony/symfony.git", - "reference": "1631040ea8fc5e0e405c00d35cbf2c0b7b555f64" + "reference": "85959c2abbe4d2f050f950f39c9c3cf83819f3df" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/symfony/zipball/1631040ea8fc5e0e405c00d35cbf2c0b7b555f64", - "reference": "1631040ea8fc5e0e405c00d35cbf2c0b7b555f64", + "url": "https://api.github.com/repos/symfony/symfony/zipball/85959c2abbe4d2f050f950f39c9c3cf83819f3df", + "reference": "85959c2abbe4d2f050f950f39c9c3cf83819f3df", "shasum": "" }, "require": { @@ -2946,7 +2946,7 @@ "keywords": [ "framework" ], - "time": "2017-04-05T12:52:29+00:00" + "time": "2017-05-01T17:47:03+00:00" }, { "name": "twig/twig", @@ -3069,16 +3069,16 @@ }, { "name": "symfony/phpunit-bridge", - "version": "v3.2.7", + "version": "v3.2.8", "source": { "type": "git", "url": "https://github.com/symfony/phpunit-bridge.git", - "reference": "9103d17dd57c512a3a027bb5628f6701464d6fef" + "reference": "00916603c524b8048906de460b7ea0dfa1651281" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/9103d17dd57c512a3a027bb5628f6701464d6fef", - "reference": "9103d17dd57c512a3a027bb5628f6701464d6fef", + "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/00916603c524b8048906de460b7ea0dfa1651281", + "reference": "00916603c524b8048906de460b7ea0dfa1651281", "shasum": "" }, "require": { @@ -3127,7 +3127,7 @@ ], "description": "Symfony PHPUnit Bridge", "homepage": "https://symfony.com", - "time": "2017-03-09T12:58:16+00:00" + "time": "2017-04-12T14:13:17+00:00" } ], "aliases": [], diff --git a/var/SymfonyRequirements.php b/var/SymfonyRequirements.php index 7e7a99d..3b14a40 100644 --- a/var/SymfonyRequirements.php +++ b/var/SymfonyRequirements.php @@ -633,12 +633,6 @@ function_exists('mb_strlen'), 'Install and enable the mbstring extension.' ); - $this->addRecommendation( - function_exists('iconv'), - 'iconv() should be available', - 'Install and enable the iconv extension.' - ); - $this->addRecommendation( function_exists('utf8_decode'), 'utf8_decode() should be available', diff --git a/web/config.php b/web/config.php index 69df43c..fd7e17e 100644 --- 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(