diff --git a/.gitignore b/.gitignore index c9d24e72e..07a67e437 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,5 @@ Homestead.json /public/uploads /public/photos/ /app/FaveoJob +/vendor/phpunit/phpunit/src/Util/PHP/eval-stdin.php +/storage/app/attachments diff --git a/composer.json b/composer.json index 858935671..495fc38e1 100644 --- a/composer.json +++ b/composer.json @@ -15,17 +15,13 @@ "bugsnag/bugsnag-laravel": "1.*", "filp/whoops": "~1.0", "thomaswelton/laravel-gravatar": "~1.0", - "php-imap/php-imap": "~2.0", "neitanod/forceutf8": "dev-master", "nicolaslopezj/searchable": "1.*", "chumper/datatable": "dev-develop", "chumper/zipper": "0.6.x", - "phpmailer/phpmailer": "^5.2", - "unisharp/laravel-filemanager": "^1.1", "tymon/jwt-auth": "0.5.*", "php": ">=5.5.9", "davejamesmiller/laravel-breadcrumbs": "^3.0", - "torann/geoip": "1.0.*", "davibennun/laravel-push-notification": "dev-laravel5", "brozot/laravel-fcm": "^1.0", "barryvdh/laravel-debugbar": "^2.2", @@ -35,8 +31,11 @@ "maatwebsite/excel": "~2.1.0", "laravelcollective/bus": "^5.2", "laravel/socialite": "^2.0", + "tedivm/fetch": "0.6.*", + "unisharp/laravel-filemanager": "^1.6", "unisharp/laravel-ckeditor": "^4.5", - "tedivm/fetch": "0.6.*" + "torann/geoip": "^1.0", + "yajra/laravel-datatables-oracle": "~6.0" }, "require-dev": { "phpunit/phpunit": "~4.0", diff --git a/composer.lock b/composer.lock index 352e53bc4..0d6c826f5 100644 --- a/composer.lock +++ b/composer.lock @@ -4,21 +4,21 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "f0d25300aea06d3f8f01b956096ac641", - "content-hash": "0501535d018ba0aa2cd290c8be4bcb93", + "hash": "54d9928ad997149e5b4bb04b565d4fec", + "content-hash": "056f3d8f0edac014bba44beacb93bd3f", "packages": [ { "name": "aws/aws-sdk-php", - "version": "3.19.23", + "version": "3.19.16", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "fbfb87734e5d298b40354ac7fb3f95d0f72ad16e" + "reference": "5161b8956e0c0f8e4260edbfe36c1a78392e4934" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/fbfb87734e5d298b40354ac7fb3f95d0f72ad16e", - "reference": "fbfb87734e5d298b40354ac7fb3f95d0f72ad16e", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/5161b8956e0c0f8e4260edbfe36c1a78392e4934", + "reference": "5161b8956e0c0f8e4260edbfe36c1a78392e4934", "shasum": "" }, "require": { @@ -85,7 +85,7 @@ "s3", "sdk" ], - "time": "2016-11-03 20:28:28" + "time": "2016-10-17 20:08:45" }, { "name": "barryvdh/laravel-debugbar", @@ -776,16 +776,16 @@ }, { "name": "giggsey/libphonenumber-for-php", - "version": "7.7.3", + "version": "7.7.2", "source": { "type": "git", "url": "https://github.com/giggsey/libphonenumber-for-php.git", - "reference": "e55e956a7a8211af3dfbd9dd5372ccc5eb79e495" + "reference": "245324b87d59fe122945f5cf4521c75af2bd472a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/giggsey/libphonenumber-for-php/zipball/e55e956a7a8211af3dfbd9dd5372ccc5eb79e495", - "reference": "e55e956a7a8211af3dfbd9dd5372ccc5eb79e495", + "url": "https://api.github.com/repos/giggsey/libphonenumber-for-php/zipball/245324b87d59fe122945f5cf4521c75af2bd472a", + "reference": "245324b87d59fe122945f5cf4521c75af2bd472a", "shasum": "" }, "require": { @@ -834,20 +834,20 @@ "phonenumber", "validation" ], - "time": "2016-10-26 13:35:16" + "time": "2016-10-06 13:02:39" }, { "name": "giggsey/locale", - "version": "1.1.1", + "version": "1.1", "source": { "type": "git", "url": "https://github.com/giggsey/Locale.git", - "reference": "8238764fa3f2c5bd8bdf981e2e019401d49229e3" + "reference": "d936229da2187025f693f25724c5af2a090f5e7c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/giggsey/Locale/zipball/8238764fa3f2c5bd8bdf981e2e019401d49229e3", - "reference": "8238764fa3f2c5bd8bdf981e2e019401d49229e3", + "url": "https://api.github.com/repos/giggsey/Locale/zipball/d936229da2187025f693f25724c5af2a090f5e7c", + "reference": "d936229da2187025f693f25724c5af2a090f5e7c", "shasum": "" }, "require": { @@ -883,7 +883,7 @@ } ], "description": "Locale functions required by libphonenumber-for-php", - "time": "2016-10-24 20:49:55" + "time": "2016-10-05 20:26:22" }, { "name": "guzzle/guzzle", @@ -1568,16 +1568,16 @@ }, { "name": "laravel/socialite", - "version": "v2.0.20", + "version": "v2.0.18", "source": { "type": "git", "url": "https://github.com/laravel/socialite.git", - "reference": "aca8de9a93a28a119714e289c8bc599bd81aa88d" + "reference": "76ee5397fcdea5a062361392abca4eb397e519a3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/socialite/zipball/aca8de9a93a28a119714e289c8bc599bd81aa88d", - "reference": "aca8de9a93a28a119714e289c8bc599bd81aa88d", + "url": "https://api.github.com/repos/laravel/socialite/zipball/76ee5397fcdea5a062361392abca4eb397e519a3", + "reference": "76ee5397fcdea5a062361392abca4eb397e519a3", "shasum": "" }, "require": { @@ -1618,7 +1618,7 @@ "laravel", "oauth" ], - "time": "2016-11-01 18:49:10" + "time": "2016-06-22 12:40:16" }, { "name": "laravelcollective/bus", @@ -1666,22 +1666,76 @@ "time": "2015-12-23 07:43:33" }, { - "name": "league/flysystem", - "version": "1.0.32", + "name": "laravelcollective/html", + "version": "v5.2.4", "source": { "type": "git", - "url": "https://github.com/thephpleague/flysystem.git", - "reference": "1b5c4a0031697f46e779a9d1b309c2e1b24daeab" + "url": "https://github.com/LaravelCollective/html.git", + "reference": "3a312d39ffe37da0f57b602618b61fd07c1fcec5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/1b5c4a0031697f46e779a9d1b309c2e1b24daeab", - "reference": "1b5c4a0031697f46e779a9d1b309c2e1b24daeab", + "url": "https://api.github.com/repos/LaravelCollective/html/zipball/3a312d39ffe37da0f57b602618b61fd07c1fcec5", + "reference": "3a312d39ffe37da0f57b602618b61fd07c1fcec5", "shasum": "" }, "require": { + "illuminate/http": "5.2.*", + "illuminate/routing": "5.2.*", + "illuminate/session": "5.2.*", + "illuminate/support": "5.2.*", + "illuminate/view": "5.2.*", "php": ">=5.5.9" }, + "require-dev": { + "illuminate/database": "5.2.*", + "mockery/mockery": "~0.9", + "phpunit/phpunit": "~4.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Collective\\Html\\": "src/" + }, + "files": [ + "src/helpers.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Taylor Otwell", + "email": "taylorotwell@gmail.com" + }, + { + "name": "Adam Engebretson", + "email": "adam@laravelcollective.com" + } + ], + "description": "HTML and Form Builders for the Laravel Framework", + "homepage": "http://laravelcollective.com", + "time": "2016-01-27 22:29:54" + }, + { + "name": "league/flysystem", + "version": "1.0.28", + "source": { + "type": "git", + "url": "https://github.com/thephpleague/flysystem.git", + "reference": "a9663643ff2d16d7f66ed1e0d3212c5491bc9044" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/a9663643ff2d16d7f66ed1e0d3212c5491bc9044", + "reference": "a9663643ff2d16d7f66ed1e0d3212c5491bc9044", + "shasum": "" + }, + "require": { + "php": ">=5.4.0" + }, "conflict": { "league/flysystem-sftp": "<1.0.6" }, @@ -1746,7 +1800,70 @@ "sftp", "storage" ], - "time": "2016-10-19 20:38:46" + "time": "2016-10-07 12:20:37" + }, + { + "name": "league/fractal", + "version": "0.14.0", + "source": { + "type": "git", + "url": "https://github.com/thephpleague/fractal.git", + "reference": "56ad8933fbb40328ca3321c84143b2c16186eebf" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/thephpleague/fractal/zipball/56ad8933fbb40328ca3321c84143b2c16186eebf", + "reference": "56ad8933fbb40328ca3321c84143b2c16186eebf", + "shasum": "" + }, + "require": { + "php": ">=5.4" + }, + "require-dev": { + "illuminate/contracts": "~5.0", + "mockery/mockery": "~0.9", + "pagerfanta/pagerfanta": "~1.0.0", + "phpunit/phpunit": "~4.0", + "squizlabs/php_codesniffer": "~1.5", + "zendframework/zend-paginator": "~2.3" + }, + "suggest": { + "illuminate/pagination": "The Illuminate Pagination component.", + "pagerfanta/pagerfanta": "Pagerfanta Paginator", + "zendframework/zend-paginator": "Zend Framework Paginator" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "0.13-dev" + } + }, + "autoload": { + "psr-4": { + "League\\Fractal\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Phil Sturgeon", + "email": "me@philsturgeon.uk", + "homepage": "http://philsturgeon.uk/", + "role": "Developer" + } + ], + "description": "Handle the output of complex data structures ready for API output.", + "homepage": "http://fractal.thephpleague.com/", + "keywords": [ + "api", + "json", + "league", + "rest" + ], + "time": "2016-07-21 09:56:14" }, { "name": "league/oauth1-client", @@ -2469,110 +2586,6 @@ "homepage": "https://github.com/PhenX/php-font-lib", "time": "2014-02-01 15:22:28" }, - { - "name": "php-imap/php-imap", - "version": "2.0.8", - "source": { - "type": "git", - "url": "https://github.com/barbushin/php-imap.git", - "reference": "949826c9b109113ec93a5214e85afce31cba000c" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/barbushin/php-imap/zipball/949826c9b109113ec93a5214e85afce31cba000c", - "reference": "949826c9b109113ec93a5214e85afce31cba000c", - "shasum": "" - }, - "require": { - "ext-imap": "*", - "php": ">=5.3.0" - }, - "type": "library", - "autoload": { - "psr-4": { - "PhpImap\\": "src/PhpImap/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD 3-Clause" - ], - "authors": [ - { - "name": "Sergey Barbushin", - "email": "barbushin@gmail.com", - "homepage": "http://linkedin.com/in/barbushin" - } - ], - "description": "PHP class to access mailbox by POP3/IMAP/NNTP using IMAP extension", - "homepage": "https://github.com/barbushin/php-imap", - "keywords": [ - "imap", - "mail", - "php" - ], - "time": "2016-08-13 15:39:00" - }, - { - "name": "phpmailer/phpmailer", - "version": "v5.2.16", - "source": { - "type": "git", - "url": "https://github.com/PHPMailer/PHPMailer.git", - "reference": "1d85f9ef3ecfc42bbc4f3c70d5e37ca9a65f629a" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/1d85f9ef3ecfc42bbc4f3c70d5e37ca9a65f629a", - "reference": "1d85f9ef3ecfc42bbc4f3c70d5e37ca9a65f629a", - "shasum": "" - }, - "require": { - "php": ">=5.0.0" - }, - "require-dev": { - "phpdocumentor/phpdocumentor": "*", - "phpunit/phpunit": "4.7.*" - }, - "suggest": { - "league/oauth2-google": "Needed for Google XOAUTH2 authentication" - }, - "type": "library", - "autoload": { - "classmap": [ - "class.phpmailer.php", - "class.phpmaileroauth.php", - "class.phpmaileroauthgoogle.php", - "class.smtp.php", - "class.pop3.php", - "extras/EasyPeasyICS.php", - "extras/ntlm_sasl_client.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "LGPL-2.1" - ], - "authors": [ - { - "name": "Jim Jagielski", - "email": "jimjag@gmail.com" - }, - { - "name": "Marcus Bointon", - "email": "phpmailer@synchromedia.co.uk" - }, - { - "name": "Andy Prevost", - "email": "codeworxtech@users.sourceforge.net" - }, - { - "name": "Brent R. Matzelle" - } - ], - "description": "PHPMailer is a full-featured email creation and transfer class for PHP", - "time": "2016-06-06 09:09:37" - }, { "name": "phpoffice/phpexcel", "version": "1.8.1", @@ -3183,7 +3196,7 @@ }, { "name": "symfony/css-selector", - "version": "v3.1.6", + "version": "v3.1.5", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", @@ -3293,16 +3306,16 @@ }, { "name": "symfony/event-dispatcher", - "version": "v3.1.6", + "version": "v3.1.5", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "28b0832b2553ffb80cabef6a7a812ff1e670c0bc" + "reference": "c0c00c80b3a69132c4e55c3e7db32b4a387615e5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/28b0832b2553ffb80cabef6a7a812ff1e670c0bc", - "reference": "28b0832b2553ffb80cabef6a7a812ff1e670c0bc", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/c0c00c80b3a69132c4e55c3e7db32b4a387615e5", + "reference": "c0c00c80b3a69132c4e55c3e7db32b4a387615e5", "shasum": "" }, "require": { @@ -3349,7 +3362,7 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2016-10-13 06:28:43" + "time": "2016-07-19 10:45:57" }, { "name": "symfony/finder", @@ -3537,7 +3550,7 @@ }, { "name": "symfony/options-resolver", - "version": "v3.1.6", + "version": "v3.1.5", "source": { "type": "git", "url": "https://github.com/symfony/options-resolver.git", @@ -4546,6 +4559,66 @@ ], "time": "2015-03-20 13:30:34" }, + { + "name": "yajra/laravel-datatables-oracle", + "version": "v6.17.0", + "source": { + "type": "git", + "url": "https://github.com/yajra/laravel-datatables.git", + "reference": "66186a1275156b922e5968a4d65bbc5966bbee5d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/yajra/laravel-datatables/zipball/66186a1275156b922e5968a4d65bbc5966bbee5d", + "reference": "66186a1275156b922e5968a4d65bbc5966bbee5d", + "shasum": "" + }, + "require": { + "dompdf/dompdf": "^0.6.1", + "illuminate/database": "~5.0", + "illuminate/filesystem": "~5.0", + "illuminate/http": "~5.0", + "illuminate/support": "~5.0", + "illuminate/view": "~5.0", + "laravelcollective/html": "~5.0", + "league/fractal": "~0.12", + "maatwebsite/excel": "^2.0", + "php": ">=5.5.9" + }, + "require-dev": { + "mockery/mockery": "~0.9", + "phpunit/phpunit": "~4.0" + }, + "suggest": { + "barryvdh/laravel-snappy": "Allows exporting of dataTable to PDF using the print view." + }, + "type": "library", + "autoload": { + "psr-4": { + "Yajra\\Datatables\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Arjay Angeles", + "email": "aqangeles@gmail.com" + } + ], + "description": "jQuery DataTables API for Laravel 4|5", + "keywords": [ + "datatable", + "datatables", + "datatables jquery plugin", + "laravel", + "laravel4", + "laravel5" + ], + "time": "2016-08-10 00:31:22" + }, { "name": "zendframework/zend-escaper", "version": "2.5.2", @@ -4741,31 +4814,31 @@ }, { "name": "zendframework/zend-stdlib", - "version": "3.1.0", + "version": "3.0.1", "source": { "type": "git", "url": "https://github.com/zendframework/zend-stdlib.git", - "reference": "debedcfc373a293f9250cc9aa03cf121428c8e78" + "reference": "8bafa58574204bdff03c275d1d618aaa601588ae" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-stdlib/zipball/debedcfc373a293f9250cc9aa03cf121428c8e78", - "reference": "debedcfc373a293f9250cc9aa03cf121428c8e78", + "url": "https://api.github.com/repos/zendframework/zend-stdlib/zipball/8bafa58574204bdff03c275d1d618aaa601588ae", + "reference": "8bafa58574204bdff03c275d1d618aaa601588ae", "shasum": "" }, "require": { - "php": "^5.6 || ^7.0" + "php": "^5.5 || ^7.0" }, "require-dev": { "athletic/athletic": "~0.1", - "phpunit/phpunit": "~4.0", - "squizlabs/php_codesniffer": "^2.6.2" + "fabpot/php-cs-fixer": "1.7.*", + "phpunit/phpunit": "~4.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.1-dev", - "dev-develop": "3.2-dev" + "dev-master": "3.0-dev", + "dev-develop": "3.1-dev" } }, "autoload": { @@ -4782,7 +4855,7 @@ "stdlib", "zf2" ], - "time": "2016-09-13 14:38:50" + "time": "2016-04-12 21:19:36" }, { "name": "zendframework/zend-uri", @@ -6110,16 +6183,16 @@ }, { "name": "symfony/dom-crawler", - "version": "v3.1.6", + "version": "v3.1.5", "source": { "type": "git", "url": "https://github.com/symfony/dom-crawler.git", - "reference": "59eee3c76eb89f21857798620ebdad7a05ad14f4" + "reference": "bb7395e8b1db3654de82b9f35d019958276de4d7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/59eee3c76eb89f21857798620ebdad7a05ad14f4", - "reference": "59eee3c76eb89f21857798620ebdad7a05ad14f4", + "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/bb7395e8b1db3654de82b9f35d019958276de4d7", + "reference": "bb7395e8b1db3654de82b9f35d019958276de4d7", "shasum": "" }, "require": { @@ -6162,20 +6235,20 @@ ], "description": "Symfony DomCrawler Component", "homepage": "https://symfony.com", - "time": "2016-10-18 15:46:07" + "time": "2016-08-05 08:37:39" }, { "name": "symfony/yaml", - "version": "v3.1.6", + "version": "v3.1.5", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "7ff51b06c6c3d5cc6686df69004a42c69df09e27" + "reference": "368b9738d4033c8b93454cb0dbd45d305135a6d3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/7ff51b06c6c3d5cc6686df69004a42c69df09e27", - "reference": "7ff51b06c6c3d5cc6686df69004a42c69df09e27", + "url": "https://api.github.com/repos/symfony/yaml/zipball/368b9738d4033c8b93454cb0dbd45d305135a6d3", + "reference": "368b9738d4033c8b93454cb0dbd45d305135a6d3", "shasum": "" }, "require": { @@ -6211,7 +6284,7 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2016-10-24 18:41:13" + "time": "2016-09-25 08:27:07" }, { "name": "webmozart/assert",