diff --git a/bin/.gitignore b/bin/.gitignore index 55d57d0..4249d7a 100644 --- a/bin/.gitignore +++ b/bin/.gitignore @@ -4,3 +4,4 @@ pscss .directory /phpca /phpunit +/phing diff --git a/build.properties b/build.properties new file mode 100644 index 0000000..e69de29 diff --git a/build.xml b/build.xml new file mode 100644 index 0000000..540637e --- /dev/null +++ b/build.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/composer.json b/composer.json index 0eb3811..610b186 100644 --- a/composer.json +++ b/composer.json @@ -18,6 +18,7 @@ "Magdev\\DossierTests\\" : "tests" } }, + "minimum-stability" : "stable", "require" : { "php" : "~7.2", "ext-phar" : "*", @@ -39,14 +40,15 @@ "erusev/parsedown-extra" : "^0.7.1", "leafo/scssphp" : "^0.7.6", "adbario/php-dot-notation" : "^2.0", - "magdev/console-form" : "^0.0.7@dev", + "magdev/console-form" : "dev-master", "monolog/monolog" : "^1.23", "pdfshift/pdfshift-php" : "~1.0.2", "raivisdejus/html-minifier" : "~0.5" }, "require-dev" : { "wapmorgan/php-code-analyzer" : "^1.0", - "phpunit/phpunit" : "~8.1" + "phpunit/phpunit" : "~8.1", + "phing/phing" : "~2.16" }, "config" : { "bin-dir" : "bin" @@ -67,6 +69,7 @@ ] } } +<<<<<<< HEAD }, "repositories" : [{ "type" : "git", @@ -75,4 +78,7 @@ } ], "minimum-stability" : "stable" +======= + } +>>>>>>> refs/heads/master } \ No newline at end of file diff --git a/composer.lock b/composer.lock index 03075f1..b036516 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,11 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], +<<<<<<< HEAD "content-hash": "62e2eefeba07c02c71eae7348eb04be8", +======= + "content-hash": "382454bc91f4b1d3ca867d38173f9eaa", +>>>>>>> refs/heads/master "packages": [ { "name": "adbario/php-dot-notation", @@ -199,11 +203,17 @@ }, { "name": "magdev/console-form", - "version": "0.0.7", + "version": "dev-master", "source": { "type": "git", "url": "https://github.com/magdev/console-form.git", - "reference": "8d903fa2d591827870f52dc1a382f642a49fe830" + "reference": "c9d540f4417f8dd0107f98d57742f4473472c79d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/magdev/console-form/zipball/c9d540f4417f8dd0107f98d57742f4473472c79d", + "reference": "c9d540f4417f8dd0107f98d57742f4473472c79d", + "shasum": "" }, "require": { "php": ">=5.4", @@ -220,6 +230,7 @@ "Droath\\ConsoleForm\\": "./src" } }, + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -227,6 +238,10 @@ { "name": "Travis Tomka", "email": "underoathosx@gmail.com" + }, + { + "name": "Marco Grätsch", + "email": "magdev3.0@gmail.com" } ], "description": "Symfony console form helper.", @@ -234,7 +249,7 @@ "console", "form" ], - "time": "2018-07-03T14:31:01+00:00" + "time": "2019-06-04T21:20:15+00:00" }, { "name": "mnapoli/front-yaml", @@ -1901,6 +1916,99 @@ "description": "Library for handling version information and constraints", "time": "2018-07-08T19:19:57+00:00" }, + { + "name": "phing/phing", + "version": "2.16.1", + "source": { + "type": "git", + "url": "https://github.com/phingofficial/phing.git", + "reference": "cbe0f969e434e269af91b4160b86fe899c6e07c7" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phingofficial/phing/zipball/cbe0f969e434e269af91b4160b86fe899c6e07c7", + "reference": "cbe0f969e434e269af91b4160b86fe899c6e07c7", + "shasum": "" + }, + "require": { + "php": ">=5.2.0", + "symfony/yaml": "^3.1 || ^4.0" + }, + "require-dev": { + "ext-pdo_sqlite": "*", + "mikey179/vfsstream": "^1.6", + "pdepend/pdepend": "2.x", + "pear/archive_tar": "1.4.x", + "pear/http_request2": "dev-trunk", + "pear/net_growl": "dev-trunk", + "pear/pear-core-minimal": "1.10.1", + "pear/versioncontrol_git": "@dev", + "pear/versioncontrol_svn": "~0.5", + "phpdocumentor/phpdocumentor": "2.x", + "phploc/phploc": "~2.0.6", + "phpmd/phpmd": "~2.2", + "phpunit/phpunit": ">=3.7", + "sebastian/git": "~1.0", + "sebastian/phpcpd": "2.x", + "siad007/versioncontrol_hg": "^1.0", + "simpletest/simpletest": "^1.1", + "squizlabs/php_codesniffer": "~2.2" + }, + "suggest": { + "pdepend/pdepend": "PHP version of JDepend", + "pear/archive_tar": "Tar file management class", + "pear/versioncontrol_git": "A library that provides OO interface to handle Git repository", + "pear/versioncontrol_svn": "A simple OO-style interface for Subversion, the free/open-source version control system", + "phpdocumentor/phpdocumentor": "Documentation Generator for PHP", + "phploc/phploc": "A tool for quickly measuring the size of a PHP project", + "phpmd/phpmd": "PHP version of PMD tool", + "phpunit/php-code-coverage": "Library that provides collection, processing, and rendering functionality for PHP code coverage information", + "phpunit/phpunit": "The PHP Unit Testing Framework", + "sebastian/phpcpd": "Copy/Paste Detector (CPD) for PHP code", + "siad007/versioncontrol_hg": "A library for interfacing with Mercurial repositories.", + "tedivm/jshrink": "Javascript Minifier built in PHP" + }, + "bin": [ + "bin/phing" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.16.x-dev" + } + }, + "autoload": { + "classmap": [ + "classes/phing/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "include-path": [ + "classes" + ], + "license": [ + "LGPL-3.0" + ], + "authors": [ + { + "name": "Michiel Rook", + "email": "mrook@php.net" + }, + { + "name": "Phing Community", + "homepage": "https://www.phing.info/trac/wiki/Development/Contributors" + } + ], + "description": "PHing Is Not GNU make; it's a PHP project build system or build tool based on Apache Ant.", + "homepage": "https://www.phing.info/", + "keywords": [ + "build", + "phing", + "task", + "tool" + ], + "time": "2018-01-25T13:18:09+00:00" + }, { "name": "phpdocumentor/reflection-common", "version": "1.0.1",