diff --git a/.env.example b/.env.example index 409b73a6..5d7e9769 100644 --- a/.env.example +++ b/.env.example @@ -69,4 +69,12 @@ SSH_PRIVATE_KEY= SCP_HOST= SCP_REMOTE_BASE_PATH=/tmp -GOOGLE_GEO_CODING_API_KEY= \ No newline at end of file +GOOGLE_GEO_CODING_API_KEY= + +CLOUD_STORAGE_BASE_URL= +CLOUD_STORAGE_CONTAINER= +CLOUD_STORAGE_AUTH_URL= +CLOUD_STORAGE_USERNAME= +CLOUD_STORAGE_APIKEY= +CLOUD_STORAGE_PROJECT_NAME= +CLOUD_STORAGE_REGION= \ No newline at end of file diff --git a/Libs/Utils/RequestUtils.php b/Libs/Utils/RequestUtils.php index 00025ac4..ccb735a6 100644 --- a/Libs/Utils/RequestUtils.php +++ b/Libs/Utils/RequestUtils.php @@ -12,28 +12,27 @@ * limitations under the License. **/ -use Illuminate\Support\Facades\App; +use Illuminate\Support\Facades\Route; use Illuminate\Support\Facades\Log; -class RequestUtils { +/** + * Class RequestUtils + * @package libs\utils + */ +final class RequestUtils { - public static function getCurrentRoutePath($request) + /** + * @return bool|string + */ + public static function getCurrentRoutePath() { try { - //gets routes from container and try to find the route - $router = App::make('router'); - $routes = $router->getRoutes(); - $route = $routes->match($request); - if (!is_null($route)) - { - $route = $route->getPath(); - if (strpos($route, '/') != 0) - { - $route = '/' . $route; - } - return $route; - } + $route_path = Route::getCurrentRoute()->uri(); + if (strpos($route_path, '/') != 0) + $route_path = '/' . $route_path; + + return $route_path; } catch (\Exception $ex) { diff --git a/app/Console/Commands/AdminActionsCalendarSyncProcessingCommand.php b/app/Console/Commands/AdminActionsCalendarSyncProcessingCommand.php index 56e039f9..cb320609 100644 --- a/app/Console/Commands/AdminActionsCalendarSyncProcessingCommand.php +++ b/app/Console/Commands/AdminActionsCalendarSyncProcessingCommand.php @@ -13,7 +13,6 @@ **/ use Illuminate\Console\Command; use App\Services\Model\IAdminActionsCalendarSyncProcessingService; - /** * Class AdminActionsCalendarSyncProcessingCommand * @package App\Console\Commands diff --git a/app/Console/Commands/MemberActionsCalendarSyncProcessingCommand.php b/app/Console/Commands/MemberActionsCalendarSyncProcessingCommand.php index 32ea2893..8bfe1d8d 100644 --- a/app/Console/Commands/MemberActionsCalendarSyncProcessingCommand.php +++ b/app/Console/Commands/MemberActionsCalendarSyncProcessingCommand.php @@ -11,7 +11,6 @@ * See the License for the specific language governing permissions and * limitations under the License. **/ - use Illuminate\Console\Command; use App\Services\Model\IMemberActionsCalendarSyncProcessingService; use models\summit\CalendarSync\CalendarSyncInfo; diff --git a/app/Console/Commands/SummitJsonGenerator.php b/app/Console/Commands/SummitJsonGenerator.php index ec4a29b5..c6d070ea 100644 --- a/app/Console/Commands/SummitJsonGenerator.php +++ b/app/Console/Commands/SummitJsonGenerator.php @@ -11,14 +11,12 @@ * See the License for the specific language governing permissions and * limitations under the License. **/ - use Illuminate\Console\Command; use libs\utils\ICacheService; use models\summit\ISummitRepository; use ModelSerializers\SerializerRegistry; use services\model\ISummitService; use Illuminate\Support\Facades\Config; - /** * Class SummitJsonGenerator * @package App\Console\Commands diff --git a/app/Console/Commands/SummitListJsonGenerator.php b/app/Console/Commands/SummitListJsonGenerator.php index 878e0006..1dc4e47d 100644 --- a/app/Console/Commands/SummitListJsonGenerator.php +++ b/app/Console/Commands/SummitListJsonGenerator.php @@ -11,7 +11,6 @@ * See the License for the specific language governing permissions and * limitations under the License. **/ - use Illuminate\Support\Facades\Log; use libs\utils\ICacheService; use Mockery\Exception; @@ -21,7 +20,6 @@ use services\model\ISummitService; use utils\PagingResponse; use Illuminate\Console\Command; use Illuminate\Support\Facades\Config; - /** * Class SummitListJsonGenerator * @package App\Console\Commands diff --git a/app/Events/FileCreated.php b/app/Events/FileCreated.php deleted file mode 100644 index 3ecd9b55..00000000 --- a/app/Events/FileCreated.php +++ /dev/null @@ -1,73 +0,0 @@ -local_path = $local_path; - $this->file_name = $file_name; - $this->folder_name = $folder_name; - } - - /** - * @return string - */ - public function getLocalPath() - { - return $this->local_path; - } - - /** - * @return string - */ - public function getFileName() - { - return $this->file_name; - } - - /** - * @return string - */ - public function getFolderName() - { - return $this->folder_name; - } - - -} \ No newline at end of file diff --git a/app/Factories/AssetsSyncRequest/FileCreatedAssetSyncRequestFactory.php b/app/Factories/AssetsSyncRequest/FileCreatedAssetSyncRequestFactory.php deleted file mode 100644 index 0a97fbf5..00000000 --- a/app/Factories/AssetsSyncRequest/FileCreatedAssetSyncRequestFactory.php +++ /dev/null @@ -1,34 +0,0 @@ -getFolderName(); - $file_name = $event->getFileName(); - $remote_base_path = Config::get('scp.scp_remote_base_path', null); - $remote_destination = sprintf("%s/%s", $remote_base_path, $file_name); - $asset_sync_request = new AssetsSyncRequest(); - $asset_sync_request->setFrom($remote_destination); - $asset_sync_request->setTo(sprintf("%s/%s", $folder_name, $file_name)); - $asset_sync_request->setProcessed(false); - return $asset_sync_request; - } -} \ No newline at end of file diff --git a/app/Http/Middleware/CORSMiddleware.php b/app/Http/Middleware/CORSMiddleware.php index 3e36dd5a..5582dc85 100644 --- a/app/Http/Middleware/CORSMiddleware.php +++ b/app/Http/Middleware/CORSMiddleware.php @@ -157,7 +157,7 @@ class CORSMiddleware $real_method = $request->headers->get('Access-Control-Request-Method'); $request->setMethod($real_method); - $route_path = RequestUtils::getCurrentRoutePath($request); + $route_path = RequestUtils::getCurrentRoutePath(); if (!$route_path || !$this->checkEndPoint($route_path, $real_method)) { $response = new Response(); diff --git a/app/Http/Middleware/EncryptCookies.php b/app/Http/Middleware/EncryptCookies.php index 3aa15f8d..7564ea27 100644 --- a/app/Http/Middleware/EncryptCookies.php +++ b/app/Http/Middleware/EncryptCookies.php @@ -1,10 +1,25 @@ -cookies as $key => $cookie) { + if ($this->isDisabled($key)) { + continue; + } + + try { + $request->cookies->set($key, $this->decryptCookie($key, $cookie)); + } catch (DecryptException $e) { + $request->cookies->set($key, null); + } + catch(\ErrorException $e1){ + $request->cookies->set($key, null); + } + } + + return $request; + } + } diff --git a/app/Http/Middleware/OAuth2BearerAccessTokenRequestValidator.php b/app/Http/Middleware/OAuth2BearerAccessTokenRequestValidator.php index 26615fdd..29539d03 100644 --- a/app/Http/Middleware/OAuth2BearerAccessTokenRequestValidator.php +++ b/app/Http/Middleware/OAuth2BearerAccessTokenRequestValidator.php @@ -86,7 +86,7 @@ class OAuth2BearerAccessTokenRequestValidator try { - $route = RequestUtils::getCurrentRoutePath($request); + $route = RequestUtils::getCurrentRoutePath(); if (!$route) { throw new OAuth2ResourceServerException( 400, diff --git a/app/Http/Middleware/RateLimitMiddleware.php b/app/Http/Middleware/RateLimitMiddleware.php index 92cebcab..31e98b2c 100644 --- a/app/Http/Middleware/RateLimitMiddleware.php +++ b/app/Http/Middleware/RateLimitMiddleware.php @@ -62,7 +62,7 @@ final class RateLimitMiddleware extends ThrottleRequests */ public function handle($request, Closure $next, $max_attempts = 0, $decay_minutes = 0) { - $route = RequestUtils::getCurrentRoutePath($request); + $route = RequestUtils::getCurrentRoutePath(); $method = $request->getMethod(); $endpoint = $this->endpoint_repository->getApiEndpointByUrlAndMethod($route, $method); $key = $this->resolveRequestSignature($request); diff --git a/app/Http/Middleware/TrimStrings.php b/app/Http/Middleware/TrimStrings.php new file mode 100644 index 00000000..5a50e7b5 --- /dev/null +++ b/app/Http/Middleware/TrimStrings.php @@ -0,0 +1,18 @@ +folder_service = $folder_service; + $this->bucket = $bucket; } /** @@ -45,17 +49,27 @@ final class FileUploader */ public function build(UploadedFile $file, $folder_name, $is_image = false){ $attachment = new File(); - $local_path = Storage::putFileAs(sprintf('/public/%s', $folder_name), $file, $file->getClientOriginalName()); - $folder = $this->folder_service->findOrMake($folder_name); + try { - $attachment->setParent($folder); - $attachment->setName($file->getClientOriginalName()); - $attachment->setFilename(sprintf("assets/%s/%s",$folder_name, $file->getClientOriginalName())); - $attachment->setTitle(str_replace(array('-','_'),' ', preg_replace('/\.[^.]+$/', '', $file->getClientOriginalName()))); - $attachment->setShowInSearch(true); - if($is_image) - $attachment->setImage(); - Event::fire(new FileCreated($local_path, $file->getClientOriginalName(), $folder_name)); + $local_path = Storage::putFileAs(sprintf('/public/%s', $folder_name), $file, $file->getClientOriginalName()); + $folder = $this->folder_service->findOrMake($folder_name); + + $attachment->setParent($folder); + $attachment->setName($file->getClientOriginalName()); + $attachment->setFilename(sprintf("assets/%s/%s", $folder_name, $file->getClientOriginalName())); + $attachment->setTitle(str_replace(array('-', '_'), ' ', preg_replace('/\.[^.]+$/', '', $file->getClientOriginalName()))); + $attachment->setShowInSearch(true); + if ($is_image) $attachment->setImage(); + $this->bucket->put($attachment, $local_path); + $attachment->setCloudMeta('LastPut', time()); + $attachment->setCloudStatus('Live'); + $attachment->setCloudSize(filesize($local_path)); + + } + catch (\Exception $ex){ + Log::error($ex); + $attachment->setCloudStatu('Error'); + } return $attachment; } } \ No newline at end of file diff --git a/app/Http/Utils/IBucket.php b/app/Http/Utils/IBucket.php new file mode 100644 index 00000000..aaaa82e4 --- /dev/null +++ b/app/Http/Utils/IBucket.php @@ -0,0 +1,30 @@ +container)) { + $openstack = new OpenStack([ + 'authUrl' => Config::get("cloudstorage.auth_url"), + 'region' => Config::get("cloudstorage.region"), + 'user' => [ + 'name' => Config::get("cloudstorage.user_name"), + 'password' => Config::get("cloudstorage.api_key"), + 'domain' => ['id' => Config::get("cloudstorage.user_domain", "default")] + ], + 'scope' => [ + 'project' => [ + 'name' => Config::get("cloudstorage.project_name"), + 'domain' => ['id' => Config::get("cloudstorage.project_domain", "default")] + ], + ] + ]); + + $this->container = $openstack->objectStoreV1()->getContainer( Config::get("cloudstorage.container")); + } + + return $this->container; + } + + /** + * @param File $f + * @param string $local_path + * @return object|StorageObject + * @throws Exception + */ + public function put(File $f, $local_path) + { + + $fp = fopen($local_path, 'r'); + if (!$fp) { + throw new Exception("Unable to open file: " . $f->getFilename()); + } + + $options = [ + 'name' => $f->getRelativeLinkFor(), + 'stream' => new Stream($fp) + ]; + + return $this->getContainer()->createObject($options); + } + + +} \ No newline at end of file diff --git a/app/ModelSerializers/Locations/SummitLocationImageSerializer.php b/app/ModelSerializers/Locations/SummitLocationImageSerializer.php index 3b7559cd..9f9c87e8 100644 --- a/app/ModelSerializers/Locations/SummitLocationImageSerializer.php +++ b/app/ModelSerializers/Locations/SummitLocationImageSerializer.php @@ -43,7 +43,7 @@ class SummitLocationImageSerializer extends SilverStripeSerializer if($this->object->hasPicture()) { $picture = $this->object->getPicture(); - $values['image_url'] = Config::get("server.assets_base_url", 'https://www.openstack.org/'). $picture->getFilename(); + $values['image_url'] = $picture->getFilename()->getUrl(); } else { diff --git a/app/ModelSerializers/Locations/SummitVenueFloorSerializer.php b/app/ModelSerializers/Locations/SummitVenueFloorSerializer.php index 9a2f0b92..7c693d7e 100644 --- a/app/ModelSerializers/Locations/SummitVenueFloorSerializer.php +++ b/app/ModelSerializers/Locations/SummitVenueFloorSerializer.php @@ -45,7 +45,7 @@ final class SummitVenueFloorSerializer extends SilverStripeSerializer // floor image $values['image']= ($floor->getImage() !== null) ? - Config::get("server.assets_base_url", 'https://www.openstack.org/').$floor->getImage()->getFilename() + $floor->getImage()->getUrl() : null; // rooms $rooms = []; diff --git a/app/ModelSerializers/Summit/Presentation/PresentationCategoryGroupSerializer.php b/app/ModelSerializers/Summit/Presentation/PresentationCategoryGroupSerializer.php index 2b929868..f9e652bd 100644 --- a/app/ModelSerializers/Summit/Presentation/PresentationCategoryGroupSerializer.php +++ b/app/ModelSerializers/Summit/Presentation/PresentationCategoryGroupSerializer.php @@ -11,9 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. **/ - use models\summit\PresentationCategoryGroup; - /** * Class PresentationCategoryGroupSerializer * @package ModelSerializers diff --git a/app/ModelSerializers/Summit/Presentation/PresentationSlideSerializer.php b/app/ModelSerializers/Summit/Presentation/PresentationSlideSerializer.php index 0b5519e5..6a559974 100644 --- a/app/ModelSerializers/Summit/Presentation/PresentationSlideSerializer.php +++ b/app/ModelSerializers/Summit/Presentation/PresentationSlideSerializer.php @@ -36,7 +36,7 @@ final class PresentationSlideSerializer extends PresentationMaterialSerializer $values = parent::serialize($expand, $fields, $relations, $params); $slide = $this->object; if(empty($values['link'])){ - $values['link'] = $slide->hasSlide() ? Config::get("server.assets_base_url", 'https://www.openstack.org/') . $slide->getSlide()->getFilename(): null; + $values['link'] = $slide->hasSlide() ? $slide->getSlide()->getUrl(): null; } return $values; } diff --git a/app/ModelSerializers/Summit/SummitAttendeeSerializer.php b/app/ModelSerializers/Summit/SummitAttendeeSerializer.php index 015f4f26..635c186a 100644 --- a/app/ModelSerializers/Summit/SummitAttendeeSerializer.php +++ b/app/ModelSerializers/Summit/SummitAttendeeSerializer.php @@ -11,11 +11,9 @@ * See the License for the specific language governing permissions and * limitations under the License. **/ - use libs\utils\JsonUtils; use Illuminate\Support\Facades\Config; use models\summit\SummitAttendee; - /** * Class SummitAttendeeSerializer * @package ModelSerializers diff --git a/app/ModelSerializers/Summit/SummitEventWithFileSerializer.php b/app/ModelSerializers/Summit/SummitEventWithFileSerializer.php index e222dbc9..e75c0481 100644 --- a/app/ModelSerializers/Summit/SummitEventWithFileSerializer.php +++ b/app/ModelSerializers/Summit/SummitEventWithFileSerializer.php @@ -31,7 +31,7 @@ final class SummitEventWithFileSerializer extends SummitEventSerializer $values = parent::serialize($expand, $fields, $relations, $params); - $values['attachment'] = $event->hasAttachment()? Config::get("server.assets_base_url", 'https://www.openstack.org/') . $event->getAttachment()->getFilename() : null; + $values['attachment'] = $event->hasAttachment()? $event->getAttachment()->getUrl() : null; return $values; } diff --git a/app/ModelSerializers/Summit/SummitSerializer.php b/app/ModelSerializers/Summit/SummitSerializer.php index 5a354ef5..b0395d5f 100644 --- a/app/ModelSerializers/Summit/SummitSerializer.php +++ b/app/ModelSerializers/Summit/SummitSerializer.php @@ -87,7 +87,7 @@ class SummitSerializer extends SilverStripeSerializer } $values['logo'] = ($summit->hasLogo()) ? - Config::get("server.assets_base_url", 'https://www.openstack.org/') . $summit->getLogo()->getFilename() + $summit->getLogo()->getUrl() : null; // pages info diff --git a/app/Models/Foundation/Main/EmailCreationRequests/SpeakerSelectionAnnouncementEmailCreationRequest.php b/app/Models/Foundation/Main/EmailCreationRequests/SpeakerSelectionAnnouncementEmailCreationRequest.php index 463aaadc..33894ad7 100644 --- a/app/Models/Foundation/Main/EmailCreationRequests/SpeakerSelectionAnnouncementEmailCreationRequest.php +++ b/app/Models/Foundation/Main/EmailCreationRequests/SpeakerSelectionAnnouncementEmailCreationRequest.php @@ -16,14 +16,13 @@ use models\summit\PresentationSpeaker; use models\summit\SpeakerAnnouncementSummitEmail; use models\summit\SummitOwned; use models\summit\SummitRegistrationPromoCode; - /** * @ORM\Entity * @ORM\Table(name="SpeakerSelectionAnnouncementEmailCreationRequest") * Class SpeakerSelectionAnnouncementEmailCreationRequest * @package models\main */ -final class SpeakerSelectionAnnouncementEmailCreationRequest +class SpeakerSelectionAnnouncementEmailCreationRequest extends EmailCreationRequest { diff --git a/app/Models/Foundation/Main/File.php b/app/Models/Foundation/Main/File.php index e2fe67c8..0d9920a8 100644 --- a/app/Models/Foundation/Main/File.php +++ b/app/Models/Foundation/Main/File.php @@ -13,6 +13,7 @@ **/ use models\utils\SilverstripeBaseModel; use Doctrine\ORM\Mapping AS ORM; +use Illuminate\Support\Facades\Config; /** * @ORM\Entity(repositoryClass="repositories\main\DoctrineFolderRepository") * @ORM\Table(name="File") @@ -52,6 +53,21 @@ class File extends SilverstripeBaseModel */ private $show_in_search; + /** + * @ORM\Column(name="CloudStatus", type="string") + */ + private $cloud_status; + + /** + * @ORM\Column(name="CloudSize", type="int") + */ + private $cloud_size; + + /** + * @ORM\Column(name="CloudMetaJson", type="string") + */ + private $cloud_metajson; + /** * @ORM\ManyToOne(targetEntity="models\main\File") * @ORM\JoinColumn(name="ParentID", referencedColumnName="ID") @@ -181,16 +197,119 @@ class File extends SilverstripeBaseModel public function __construct() { parent::__construct(); - $this->class_name = 'File'; + $this->class_name = 'CloudFile'; $this->show_in_search = true; } public function setImage(){ - $this->class_name = 'Image'; + $this->class_name = 'CloudImage'; } public function setFolder(){ $this->class_name = 'Folder'; } + /** + * @return string + */ + public function getCloudStatus() + { + return $this->cloud_status; + } + + /** + * @param string $cloud_status + */ + public function setCloudStatus($cloud_status): void + { + $this->cloud_status = $cloud_status; + } + + /** + * @return int + */ + public function getCloudSize() + { + return $this->cloud_size; + } + + /** + * @param int $cloud_size + */ + public function setCloudSize($cloud_size): void + { + $this->cloud_size = $cloud_size; + } + + /** + * @param string $cloud_metajson + */ + public function setCloudMetaJSON($cloud_metajson): void + { + $this->cloud_metajson = $cloud_metajson; + } + + /** + * @return string + */ + public function getUrl() + { + $local = Config::get("server.assets_base_url", 'https://www.openstack.org/').$this->getFilename(); + return $this->cloud_status == 'Live' ? $this->getCloudLink() : $local; + } + + /** + * @return string + */ + public function getRelativeLinkFor() + { + $fn = $this->getFilename(); + return trim(str_replace("assets", '', $fn), '/'); + } + + /** + * @return string + */ + public function getCloudLink() + { + return Config::get("cloudstorage.base_url") . $this->getRelativeLinkFor(); + } + + /** + * @param string|array $key - passing an array as the first argument replaces the meta data entirely + * @param mixed $val + * @return File - chainable + */ + public function setCloudMeta($key, $val = null) + { + if (is_array($key)) { + $data = $key; + } else { + $data = $this->getCloudMetaJSON(); + $data[$key] = $val; + } + + $this->cloud_metajson = json_encode($data); + return $this; + } + + + /** + * @param string $key [optional] - if not present returns the whole array + * @return array + */ + public function getCloudMetaJSON($key = null) + { + $data = json_decode($this->cloud_metajson, true); + if (empty($data) || !is_array($data)) { + $data = array(); + } + + if (!empty($key)) { + return isset($data[$key]) ? $data[$key] : null; + } else { + return $data; + } + } + } \ No newline at end of file diff --git a/app/Models/Foundation/Main/Language.php b/app/Models/Foundation/Main/Language.php index ec00521a..5b4e1ddf 100644 --- a/app/Models/Foundation/Main/Language.php +++ b/app/Models/Foundation/Main/Language.php @@ -20,7 +20,7 @@ use models\utils\SilverstripeBaseModel; * Class Language * @package App\Models\Foundation\Main */ -final class Language extends SilverstripeBaseModel +class Language extends SilverstripeBaseModel { /** * @ORM\Column(name="Name", type="string") diff --git a/app/Models/Foundation/Main/SummitMemberFavorite.php b/app/Models/Foundation/Main/SummitMemberFavorite.php index cb17d70d..eb688faa 100644 --- a/app/Models/Foundation/Main/SummitMemberFavorite.php +++ b/app/Models/Foundation/Main/SummitMemberFavorite.php @@ -20,7 +20,7 @@ use models\summit\SummitEvent; * Class SummitMemberSchedule * @package models\main */ -final class SummitMemberFavorite extends BaseEntity +class SummitMemberFavorite extends BaseEntity { /** diff --git a/app/Models/Foundation/Main/SummitMemberSchedule.php b/app/Models/Foundation/Main/SummitMemberSchedule.php index 71f199b6..1855d6b2 100644 --- a/app/Models/Foundation/Main/SummitMemberSchedule.php +++ b/app/Models/Foundation/Main/SummitMemberSchedule.php @@ -21,7 +21,7 @@ use models\utils\IEntity; * Class SummitMemberSchedule * @package models\main */ -final class SummitMemberSchedule extends BaseEntity +class SummitMemberSchedule extends BaseEntity { /** diff --git a/app/Models/Foundation/Marketplace/MarketPlaceReview.php b/app/Models/Foundation/Marketplace/MarketPlaceReview.php index 6631936c..26f7cd75 100644 --- a/app/Models/Foundation/Marketplace/MarketPlaceReview.php +++ b/app/Models/Foundation/Marketplace/MarketPlaceReview.php @@ -19,7 +19,7 @@ use models\utils\SilverstripeBaseModel; * Class MarketPlaceReview * @package App\Models\Foundation\Marketplace */ -final class MarketPlaceReview extends SilverstripeBaseModel +class MarketPlaceReview extends SilverstripeBaseModel { /** diff --git a/app/Models/Foundation/Summit/Attendees/SummitAttendee.php b/app/Models/Foundation/Summit/Attendees/SummitAttendee.php index efbad768..a5c870c3 100644 --- a/app/Models/Foundation/Summit/Attendees/SummitAttendee.php +++ b/app/Models/Foundation/Summit/Attendees/SummitAttendee.php @@ -21,6 +21,12 @@ use models\main\SummitMemberSchedule; use models\utils\SilverstripeBaseModel; /** * @ORM\Entity + * @ORM\AssociationOverrides({ + * @ORM\AssociationOverride( + * name="summit", + * inversedBy="attendees" + * ) + * }) * @ORM\Table(name="SummitAttendee") * @ORM\Entity(repositoryClass="App\Repositories\Summit\DoctrineSummitAttendeeRepository") * Class SummitAttendee diff --git a/app/Models/Foundation/Summit/CalendarSync/CalendarSyncInfoCalDav.php b/app/Models/Foundation/Summit/CalendarSync/CalendarSyncInfoCalDav.php index f51265bc..64dc0fb2 100644 --- a/app/Models/Foundation/Summit/CalendarSync/CalendarSyncInfoCalDav.php +++ b/app/Models/Foundation/Summit/CalendarSync/CalendarSyncInfoCalDav.php @@ -11,17 +11,15 @@ * See the License for the specific language governing permissions and * limitations under the License. **/ - use Doctrine\ORM\Mapping AS ORM; use services\utils\Facades\Encryption; - /** * Class CalendarSyncInfoCalDav * @ORM\Entity * @ORM\Table(name="CalendarSyncInfoCalDav") * @package models\summit\CalendarSync */ -final class CalendarSyncInfoCalDav extends CalendarSyncInfo +class CalendarSyncInfoCalDav extends CalendarSyncInfo { /** * @ORM\Column(name="UserName", type="string") diff --git a/app/Models/Foundation/Summit/CalendarSync/CalendarSyncInfoOAuth2.php b/app/Models/Foundation/Summit/CalendarSync/CalendarSyncInfoOAuth2.php index d6361819..fd37fbf9 100644 --- a/app/Models/Foundation/Summit/CalendarSync/CalendarSyncInfoOAuth2.php +++ b/app/Models/Foundation/Summit/CalendarSync/CalendarSyncInfoOAuth2.php @@ -11,17 +11,15 @@ * See the License for the specific language governing permissions and * limitations under the License. **/ - use Doctrine\ORM\Mapping AS ORM; use services\utils\Facades\Encryption; - /** * Class CalendarSyncInfoOAuth2 * @ORM\Entity * @ORM\Table(name="CalendarSyncInfoOAuth2") * @package models\summit\CalendarSync */ -final class CalendarSyncInfoOAuth2 extends CalendarSyncInfo +class CalendarSyncInfoOAuth2 extends CalendarSyncInfo { /** * @ORM\Column(name="AccessToken", type="string") diff --git a/app/Models/Foundation/Summit/CalendarSync/WorkQueue/AdminSummitLocationActionSyncWorkRequest.php b/app/Models/Foundation/Summit/CalendarSync/WorkQueue/AdminSummitLocationActionSyncWorkRequest.php index d841ff0f..45868bef 100644 --- a/app/Models/Foundation/Summit/CalendarSync/WorkQueue/AdminSummitLocationActionSyncWorkRequest.php +++ b/app/Models/Foundation/Summit/CalendarSync/WorkQueue/AdminSummitLocationActionSyncWorkRequest.php @@ -19,7 +19,7 @@ use models\summit\SummitAbstractLocation; * @ORM\Table(name="AdminSummitLocationActionSyncWorkRequest") * @package models\summit\CalendarSync\WorkQueue */ -final class AdminSummitLocationActionSyncWorkRequest +class AdminSummitLocationActionSyncWorkRequest extends AdminScheduleSummitActionSyncWorkRequest { const SubType = 'ADMIN_LOCATION'; diff --git a/app/Models/Foundation/Summit/Events/Presentations/PresentationCategory.php b/app/Models/Foundation/Summit/Events/Presentations/PresentationCategory.php index 85856ee5..2e3a14a9 100644 --- a/app/Models/Foundation/Summit/Events/Presentations/PresentationCategory.php +++ b/app/Models/Foundation/Summit/Events/Presentations/PresentationCategory.php @@ -22,6 +22,12 @@ use Doctrine\Common\Collections\ArrayCollection; /** * Class PresentationCategory * @ORM\Entity(repositoryClass="App\Repositories\Summit\DoctrineSummitTrackRepository") + * @ORM\AssociationOverrides({ + * @ORM\AssociationOverride( + * name="summit", + * inversedBy="presentation_categories" + * ) + * }) * @ORM\Table(name="PresentationCategory") * @package models\summit */ diff --git a/app/Models/Foundation/Summit/Events/Presentations/TrackQuestions/TrackRadioButtonListQuestionTemplate.php b/app/Models/Foundation/Summit/Events/Presentations/TrackQuestions/TrackRadioButtonListQuestionTemplate.php index 877354f4..302fc2df 100644 --- a/app/Models/Foundation/Summit/Events/Presentations/TrackQuestions/TrackRadioButtonListQuestionTemplate.php +++ b/app/Models/Foundation/Summit/Events/Presentations/TrackQuestions/TrackRadioButtonListQuestionTemplate.php @@ -19,7 +19,7 @@ use Doctrine\ORM\Mapping AS ORM; * Class TrackRadioButtonListQuestionTemplate * @package App\Models\Foundation\Summit\Events\Presentations\TrackQuestions */ -final class TrackRadioButtonListQuestionTemplate extends TrackMultiValueQuestionTemplate +class TrackRadioButtonListQuestionTemplate extends TrackMultiValueQuestionTemplate { const ClassName = 'TrackRadioButtonListQuestionTemplate'; diff --git a/app/Models/Foundation/Summit/Events/Presentations/TrackQuestions/TrackTextBoxQuestionTemplate.php b/app/Models/Foundation/Summit/Events/Presentations/TrackQuestions/TrackTextBoxQuestionTemplate.php index 2d6988eb..0dbd20b0 100644 --- a/app/Models/Foundation/Summit/Events/Presentations/TrackQuestions/TrackTextBoxQuestionTemplate.php +++ b/app/Models/Foundation/Summit/Events/Presentations/TrackQuestions/TrackTextBoxQuestionTemplate.php @@ -18,7 +18,7 @@ use Doctrine\ORM\Mapping AS ORM; * Class TrackTextBoxQuestionTemplate * @package App\Models\Foundation\Summit\Events\Presentations\TrackQuestions */ -final class TrackTextBoxQuestionTemplate extends TrackSingleValueTemplateQuestion +class TrackTextBoxQuestionTemplate extends TrackSingleValueTemplateQuestion { const ClassName = 'TrackTextBoxQuestionTemplate'; diff --git a/app/Models/Foundation/Summit/Events/RSVP/Templates/RSVPTemplate.php b/app/Models/Foundation/Summit/Events/RSVP/Templates/RSVPTemplate.php index 97feb665..2c343ccd 100644 --- a/app/Models/Foundation/Summit/Events/RSVP/Templates/RSVPTemplate.php +++ b/app/Models/Foundation/Summit/Events/RSVP/Templates/RSVPTemplate.php @@ -22,6 +22,12 @@ use Doctrine\ORM\Mapping AS ORM; /** * @ORM\Table(name="RSVPTemplate") * @ORM\Entity(repositoryClass="App\Repositories\Summit\DoctrineRSVPTemplateRepository") + * @ORM\AssociationOverrides({ + * @ORM\AssociationOverride( + * name="summit", + * inversedBy="rsvp_templates" + * ) + * }) * Class RSVPTemplate * @package App\Models\Foundation\Summit\Events\RSVP */ diff --git a/app/Models/Foundation/Summit/Events/SummitEntityEvent.php b/app/Models/Foundation/Summit/Events/SummitEntityEvent.php index f5e3ac30..b29bda0d 100644 --- a/app/Models/Foundation/Summit/Events/SummitEntityEvent.php +++ b/app/Models/Foundation/Summit/Events/SummitEntityEvent.php @@ -11,14 +11,18 @@ * See the License for the specific language governing permissions and * limitations under the License. **/ - use models\main\Member; use models\utils\IEntity; use models\utils\SilverstripeBaseModel; use Doctrine\ORM\Mapping AS ORM; - /** * @ORM\Entity + * @ORM\AssociationOverrides({ + * @ORM\AssociationOverride( + * name="summit", + * inversedBy="entity_events" + * ) + * }) * @ORM\Table(name="SummitEntityEvent") * @ORM\Entity(repositoryClass="App\Repositories\Summit\DoctrineSummitEntityEventRepository") * Class SummitEntityEvent diff --git a/app/Models/Foundation/Summit/Events/SummitEvent.php b/app/Models/Foundation/Summit/Events/SummitEvent.php index 692b2f0a..835b5a73 100644 --- a/app/Models/Foundation/Summit/Events/SummitEvent.php +++ b/app/Models/Foundation/Summit/Events/SummitEvent.php @@ -30,6 +30,12 @@ use Cocur\Slugify\Slugify; use Doctrine\ORM\Mapping AS ORM; /** * @ORM\Entity(repositoryClass="App\Repositories\Summit\DoctrineSummitEventRepository") + * @ORM\AssociationOverrides({ + * @ORM\AssociationOverride( + * name="summit", + * inversedBy="events" + * ) + * }) * @ORM\Table(name="SummitEvent") * @ORM\InheritanceType("JOINED") * @ORM\DiscriminatorColumn(name="ClassName", type="string") diff --git a/app/Models/Foundation/Summit/Events/SummitEventType.php b/app/Models/Foundation/Summit/Events/SummitEventType.php index 9ff318fe..96239884 100644 --- a/app/Models/Foundation/Summit/Events/SummitEventType.php +++ b/app/Models/Foundation/Summit/Events/SummitEventType.php @@ -15,6 +15,12 @@ use models\utils\SilverstripeBaseModel; use Doctrine\ORM\Mapping AS ORM; /** * @ORM\Entity(repositoryClass="App\Repositories\Summit\DoctrineSummitEventTypeRepository") + * @ORM\AssociationOverrides({ + * @ORM\AssociationOverride( + * name="summit", + * inversedBy="event_types" + * ) + * }) * @ORM\Table(name="SummitEventType") * @ORM\InheritanceType("JOINED") * @ORM\DiscriminatorColumn(name="ClassName", type="string") diff --git a/app/Models/Foundation/Summit/Events/SummitGroupEvent.php b/app/Models/Foundation/Summit/Events/SummitGroupEvent.php index f079f419..9039ec34 100644 --- a/app/Models/Foundation/Summit/Events/SummitGroupEvent.php +++ b/app/Models/Foundation/Summit/Events/SummitGroupEvent.php @@ -37,11 +37,12 @@ class SummitGroupEvent extends SummitEvent */ private $groups; + const ClassName = 'SummitGroupEvent'; /** * @return string */ public function getClassName(){ - return "SummitGroupEvent"; + return self::ClassName; } public function __construct() diff --git a/app/Models/Foundation/Summit/Locations/Metrics/RoomMetricSampleData.php b/app/Models/Foundation/Summit/Locations/Metrics/RoomMetricSampleData.php index ff2e69fa..6c7222be 100644 --- a/app/Models/Foundation/Summit/Locations/Metrics/RoomMetricSampleData.php +++ b/app/Models/Foundation/Summit/Locations/Metrics/RoomMetricSampleData.php @@ -1,5 +1,4 @@ getHandlers() as $handler) { + $logger = Log::getLogger(); + foreach($logger->getHandlers() as $handler) { $handler->setLevel(Config::get('log.level', 'debug')); } @@ -97,10 +97,9 @@ class AppServiceProvider extends ServiceProvider if (!empty($to) && !empty($from)) { $subject = 'openstackid-resource-server error'; - $mono_log = Log::getMonolog(); $handler = new NativeMailerHandler($to, $subject, $from); $handler->setLevel(Config::get('log.email_level', 'error')); - $mono_log->pushHandler($handler); + $logger->pushHandler($handler); } Validator::extend('int_array', function($attribute, $value, $parameters, $validator) diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php index 551fc49f..24b03f2b 100644 --- a/app/Providers/EventServiceProvider.php +++ b/app/Providers/EventServiceProvider.php @@ -13,9 +13,7 @@ **/ use App\EntityPersisters\AdminSummitEventActionSyncWorkRequestPersister; use App\EntityPersisters\AdminSummitLocationActionSyncWorkRequestPersister; -use App\EntityPersisters\AssetSyncRequestPersister; use App\EntityPersisters\EntityEventPersister; -use App\Factories\AssetsSyncRequest\FileCreatedAssetSyncRequestFactory; use App\Factories\CalendarAdminActionSyncWorkRequest\AdminSummitLocationActionSyncWorkRequestFactory; use App\Factories\CalendarAdminActionSyncWorkRequest\SummitEventDeletedCalendarSyncWorkRequestFactory; use App\Factories\CalendarAdminActionSyncWorkRequest\SummitEventUpdatedCalendarSyncWorkRequestFactory; @@ -40,7 +38,6 @@ use App\Factories\EntityEvents\SummitEventUpdatedEntityEventFactory; use App\Factories\EntityEvents\SummitTicketTypeActionEntityEventFactory; use App\Factories\EntityEvents\TrackActionEntityEventFactory; use App\Factories\EntityEvents\TrackGroupActionActionEntityEventFactory; -use App\Services\Utils\SCPFileUploader; use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider; use Illuminate\Support\Facades\Event; /** @@ -123,12 +120,6 @@ final class EventServiceProvider extends ServiceProvider EntityEventPersister::persist(PresentationMaterialDeletedEntityEventFactory::build($event)); }); - Event::listen(\App\Events\FileCreated::class, function($event) - { - SCPFileUploader::upload($event); - AssetSyncRequestPersister::persist(FileCreatedAssetSyncRequestFactory::build($event)); - }); - Event::listen(\App\Events\PresentationSpeakerCreated::class, function($event) { EntityEventPersister::persist_list(PresentationSpeakerCreatedEntityEventFactory::build($event)); diff --git a/app/Repositories/Summit/DoctrineSummitEventRepository.php b/app/Repositories/Summit/DoctrineSummitEventRepository.php index 0e15374e..5a4570b8 100644 --- a/app/Repositories/Summit/DoctrineSummitEventRepository.php +++ b/app/Repositories/Summit/DoctrineSummitEventRepository.php @@ -27,6 +27,8 @@ use utils\PagingInfo; use utils\PagingResponse; use Doctrine\ORM\Query\Expr\Join; use utils\DoctrineLeftJoinFilterMapping; +use models\summit\SummitGroupEvent; +use models\summit\Presentation; /** * Class DoctrineSummitEventRepository * @package App\Repositories\Summit @@ -37,8 +39,8 @@ final class DoctrineSummitEventRepository { - private static $forbidded_classes = [ - 'models\\summit\\SummitGroupEvent' + private static $forbidden_classes = [ + SummitGroupEvent::ClassName, ]; /** @@ -51,17 +53,26 @@ final class DoctrineSummitEventRepository $end_date = $event->getEndDate(); $start_date = $event->getStartDate(); - return $this->getEntityManager()->createQueryBuilder() + $query = $this->getEntityManager()->createQueryBuilder() ->select("e") ->from(\models\summit\SummitEvent::class, "e") ->join('e.summit', 's', Join::WITH, " s.id = :summit_id") ->where('e.published = 1') ->andWhere('e.start_date < :end_date') - ->andWhere("not e INSTANCE OF ('" . implode("','", self::$forbidded_classes) . "')") ->andWhere('e.end_date > :start_date') ->setParameter('summit_id', $summit->getId()) ->setParameter('start_date', $start_date) - ->setParameter('end_date', $end_date)->getQuery()->getResult(); + ->setParameter('end_date', $end_date); + + $idx = 1; + foreach(self::$forbidden_classes as $forbidden_class){ + $query = $query + ->andWhere("not e INSTANCE OF :forbidden_class".$idx); + $query->setParameter("forbidden_class".$idx, $forbidden_class); + $idx++; + } + + return $query->getQuery()->getResult(); } /** @@ -212,8 +223,13 @@ final class DoctrineSummitEventRepository $can_view_private_events = self::isCurrentMemberOnGroup(IGroup::SummitAdministrators); if(!$can_view_private_events){ - $query = $query - ->andWhere("not e INSTANCE OF ('" . implode("','", self::$forbidded_classes) . "')"); + $idx = 1; + foreach(self::$forbidden_classes as $forbidden_class){ + $query = $query + ->andWhere("not e INSTANCE OF :forbidden_class".$idx); + $query->setParameter("forbidden_class".$idx, $forbidden_class); + $idx++; + } } $query = $query @@ -303,8 +319,13 @@ final class DoctrineSummitEventRepository $can_view_private_events = self::isCurrentMemberOnGroup(IGroup::SummitAdministrators); if(!$can_view_private_events){ - $query = $query - ->andWhere("not e INSTANCE OF ('" . implode("','", self::$forbidded_classes) . "')"); + $idx = 1; + foreach(self::$forbidden_classes as $forbidden_class){ + $query = $query + ->andWhere("not e INSTANCE OF :forbidden_class".$idx); + $query->setParameter("forbidden_class".$idx, $forbidden_class); + $idx++; + } } $query = $query diff --git a/app/Repositories/Summit/DoctrineSummitLocationRepository.php b/app/Repositories/Summit/DoctrineSummitLocationRepository.php index db06cb11..5ef5f389 100644 --- a/app/Repositories/Summit/DoctrineSummitLocationRepository.php +++ b/app/Repositories/Summit/DoctrineSummitLocationRepository.php @@ -26,6 +26,7 @@ use utils\Filter; use utils\Order; use utils\PagingInfo; use utils\PagingResponse; +use models\summit\SummitVenueRoom; /** * Class DoctrineSummitLocationRepository * @package App\Repositories\Summit @@ -35,8 +36,8 @@ final class DoctrineSummitLocationRepository implements ISummitLocationRepository { - private static $forbidded_classes = [ - 'models\\summit\\SummitVenueRoom', + private static $forbidden_classes = [ + SummitVenueRoom::ClassName, ]; /** @@ -109,8 +110,15 @@ final class DoctrineSummitLocationRepository ->leftJoin(SummitHotel::class, 'h', 'WITH', 'h.id = el.id') ->leftJoin(SummitAirport::class, 'ap', 'WITH', 'ap.id = el.id') ->leftJoin('al.summit', 's') - ->where("s.id = :summit_id") - ->andWhere("not al INSTANCE OF ('" . implode("','", self::$forbidded_classes) . "')"); + ->where("s.id = :summit_id"); + + $idx = 1; + foreach(self::$forbidden_classes as $forbidden_class){ + $query = $query + ->andWhere("not al INSTANCE OF :forbidden_class".$idx); + $query->setParameter("forbidden_class".$idx, $forbidden_class); + $idx++; + } $query->setParameter("summit_id", $summit->getId()); diff --git a/app/Services/Model/SpeakerService.php b/app/Services/Model/SpeakerService.php index 124b474e..6dc061fe 100644 --- a/app/Services/Model/SpeakerService.php +++ b/app/Services/Model/SpeakerService.php @@ -570,7 +570,7 @@ final class SpeakerService throw new ValidationException(sprintf("file exceeds max_file_size (%s MB).", ($max_file_size / 1024) / 1024)); } - $uploader = new FileUploader($this->folder_service); + $uploader = new FileUploader($this->folder_service, new SwiftBucket); $photo = $uploader->build($file, 'profile-images', true); $speaker->setPhoto($photo); diff --git a/app/Services/Model/SummitLocationService.php b/app/Services/Model/SummitLocationService.php index be560715..db5796e1 100644 --- a/app/Services/Model/SummitLocationService.php +++ b/app/Services/Model/SummitLocationService.php @@ -1172,7 +1172,7 @@ final class SummitLocationService ); } - $uploader = new FileUploader($this->folder_service); + $uploader = new FileUploader($this->folder_service, new SwiftBucket); $pic = $uploader->build($file, sprintf('summits/%s/locations/%s/maps', $location->getSummitId(), $location->getId()), true); $map = SummitLocationImageFactory::buildMap($metadata); $map->setPicture($pic); @@ -1276,7 +1276,7 @@ final class SummitLocationService ); } - $uploader = new FileUploader($this->folder_service); + $uploader = new FileUploader($this->folder_service, new SwiftBucket); $pic = $uploader->build($file, sprintf('summits/%s/locations/%s/maps', $location->getSummitId(), $location->getId()), true); $map->setPicture($pic); } @@ -1443,7 +1443,7 @@ final class SummitLocationService ); } - $uploader = new FileUploader($this->folder_service); + $uploader = new FileUploader($this->folder_service, new SwiftBucket); $pic = $uploader->build($file, sprintf('summits/%s/locations/%s/images', $location->getSummitId(), $location->getId()), true); $image = SummitLocationImageFactory::buildImage($metadata); $image->setPicture($pic); @@ -1547,7 +1547,7 @@ final class SummitLocationService ); } - $uploader = new FileUploader($this->folder_service); + $uploader = new FileUploader($this->folder_service, new SwiftBucket); $pic = $uploader->build($file, sprintf('summits/%s/locations/%s/images', $location->getSummitId(), $location->getId()), true); $image->setPicture($pic); } diff --git a/app/Services/Model/SummitService.php b/app/Services/Model/SummitService.php index d56e1100..6c5c072b 100644 --- a/app/Services/Model/SummitService.php +++ b/app/Services/Model/SummitService.php @@ -18,6 +18,7 @@ use App\Events\MyScheduleRemove; use App\Events\SummitDeleted; use App\Events\SummitUpdated; use App\Http\Utils\FileUploader; +use App\Http\Utils\SwiftBucket; use App\Models\Foundation\Summit\Factories\SummitFactory; use App\Models\Foundation\Summit\Repositories\IDefaultSummitEventTypeRepository; use App\Models\Utils\IntervalParser; @@ -1282,7 +1283,7 @@ final class SummitService extends AbstractService implements ISummitService throw new ValidationException(sprintf( "file exceeds max_file_size (%s MB).", ($max_file_size/1024)/1024)); } - $uploader = new FileUploader($this->folder_service); + $uploader = new FileUploader($this->folder_service, new SwiftBucket); $attachment = $uploader->build($file, 'summit-event-attachments', true); $event->setAttachment($attachment); diff --git a/app/Services/ServicesProvider.php b/app/Services/ServicesProvider.php index b7d423f5..7dca82ef 100644 --- a/app/Services/ServicesProvider.php +++ b/app/Services/ServicesProvider.php @@ -94,7 +94,8 @@ final class ServicesProvider extends ServiceProvider }); // setting facade - $this->app['encryption'] = App::share(function ($app) { + + App::singleton('encryption', function ($app) { return new \services\utils\EncryptionService( Config::get("server.ss_encrypt_key", ''), Config::get("server.ss_encrypt_cypher", '') diff --git a/app/Services/Utils/SCPFileUploader.php b/app/Services/Utils/SCPFileUploader.php deleted file mode 100644 index 59487502..00000000 --- a/app/Services/Utils/SCPFileUploader.php +++ /dev/null @@ -1,47 +0,0 @@ -getLocalPath(); - $file_name = $event->getFileName(); - $remote_base_path = Config::get('scp.scp_remote_base_path', null); - $client = new SftpClient(); - $host = Config::get('scp.scp_host', null); - - $credentials = Credentials::withPublicKey - ( - Config::get('scp.ssh_user', null), - Config::get('scp.ssh_public_key', null), - Config::get('scp.ssh_private_key', null) - ); - - $client->setCredentials($credentials); - $client->connect($host); - $remote_destination = sprintf("%s/%s", $remote_base_path, $file_name); - $client->scpUpload(sprintf("%s/app/%s", $storage_path, $local_path), $remote_destination); - $client->close(); - } -} \ No newline at end of file diff --git a/app/User.php b/app/User.php new file mode 100644 index 00000000..bfd96a6a --- /dev/null +++ b/app/User.php @@ -0,0 +1,29 @@ +=5.5.9", - "laravel/framework": "5.3.*", - "predis/predis": "1.0.1", + "php": "^7.1.3", + "fideloper/proxy": "^4.0", + "laravel/framework": "5.6.*", + "laravel/tinker": "^1.0", + "predis/predis": "1.0.*", + "ext-json":"*", + "ext-pdo":"*", "ezyang/htmlpurifier": "4.7.0", "glenscott/url-normalizer" : "^1.4", - "laravel-doctrine/orm":"1.2.*", + "laravel-doctrine/orm":"1.4.*", "laravel-doctrine/extensions": "1.0.*", "cocur/slugify": "^2.3", "guzzlehttp/guzzle": "^6.3", "google/apiclient": "^2.2", "smarcet/caldavclient": "1.1.6", "smarcet/outlook-rest-client": "dev-master", - "idct/sftp-client": "dev-master" + "idct/sftp-client": "dev-master", + "php-opencloud/openstack": "3.0.5" }, "require-dev": { - "fzaninotto/faker": "~1.4", - "phpunit/phpunit": "~4.0", - "symfony/css-selector": "3.1.*", - "symfony/dom-crawler": "3.1.*", - "mockery/mockery": "^0.9.9" + "filp/whoops": "^2.0", + "fzaninotto/faker": "^1.4", + "mockery/mockery": "^1.0", + "nunomaduro/collision": "^2.0", + "phpunit/phpunit": "^7.0", + "laravel/browser-kit-testing": "4.0.2" + }, + "suggest":{ + "lib-openssl": "Required to use AES algorithms (except AES GCM)", + "ext-json":"Required to use json algorithms" }, "autoload": { "classmap": [ + "database/seeds", + "database/factories", "database", "app", "tests", @@ -41,28 +53,33 @@ } }, "autoload-dev": { - "classmap": [ - "tests/TestCase.php" - ] + "psr-4": { + "Tests\\": "tests/" + } + }, + "extra": { + "laravel": { + "dont-discover": [ + ] + } }, "scripts": { "post-root-package-install": [ - "php -r \"copy('.env.example', '.env');\"" + "@php -r \"file_exists('.env') || copy('.env.example', '.env');\"" ], "post-create-project-cmd": [ - "php artisan key:generate" + "@php artisan key:generate" ], - "post-install-cmd": [ - "Illuminate\\Foundation\\ComposerScripts::postInstall", - "php artisan optimize" - ], - "post-update-cmd": [ - "Illuminate\\Foundation\\ComposerScripts::postUpdate", - "php artisan optimize" + "post-autoload-dump": [ + "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump", + "@php artisan package:discover" ] }, "config": { - "preferred-install": "dist" + "preferred-install": "dist", + "sort-packages": true, + "optimize-autoloader": true }, - "minimum-stability":"dev" + "minimum-stability": "dev", + "prefer-stable": true } diff --git a/composer.lock b/composer.lock index 2fe1fe0c..3fef7729 100644 --- a/composer.lock +++ b/composer.lock @@ -1,68 +1,14 @@ { "_readme": [ "This file locks the dependencies of your project to a known state", - "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", + "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": "ba2c34f083348684b369143927f51c61", + "content-hash": "ea2bed03ed63f18844b3910861830bb1", "packages": [ - { - "name": "classpreloader/classpreloader", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/ClassPreloader/ClassPreloader.git", - "reference": "4729e438e0ada350f91148e7d4bb9809342575ff" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/ClassPreloader/ClassPreloader/zipball/4729e438e0ada350f91148e7d4bb9809342575ff", - "reference": "4729e438e0ada350f91148e7d4bb9809342575ff", - "shasum": "" - }, - "require": { - "nikic/php-parser": "^1.0|^2.0|^3.0", - "php": ">=5.5.9" - }, - "require-dev": { - "phpunit/phpunit": "^4.8|^5.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.2-dev" - } - }, - "autoload": { - "psr-4": { - "ClassPreloader\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Michael Dowling", - "email": "mtdowling@gmail.com" - }, - { - "name": "Graham Campbell", - "email": "graham@alt-three.com" - } - ], - "description": "Helps class loading performance by generating a single PHP file containing all of the autoloaded files for a specific use case", - "keywords": [ - "autoload", - "class", - "preload" - ], - "time": "2017-12-10T11:40:39+00:00" - }, { "name": "cocur/slugify", - "version": "2.5.x-dev", + "version": "v2.5", "source": { "type": "git", "url": "https://github.com/cocur/slugify.git", @@ -159,30 +105,30 @@ }, { "name": "doctrine/annotations", - "version": "v1.4.0", + "version": "v1.6.0", "source": { "type": "git", "url": "https://github.com/doctrine/annotations.git", - "reference": "54cacc9b81758b14e3ce750f205a393d52339e97" + "reference": "c7f2050c68a9ab0bdb0f98567ec08d80ea7d24d5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/annotations/zipball/54cacc9b81758b14e3ce750f205a393d52339e97", - "reference": "54cacc9b81758b14e3ce750f205a393d52339e97", + "url": "https://api.github.com/repos/doctrine/annotations/zipball/c7f2050c68a9ab0bdb0f98567ec08d80ea7d24d5", + "reference": "c7f2050c68a9ab0bdb0f98567ec08d80ea7d24d5", "shasum": "" }, "require": { "doctrine/lexer": "1.*", - "php": "^5.6 || ^7.0" + "php": "^7.1" }, "require-dev": { "doctrine/cache": "1.*", - "phpunit/phpunit": "^5.7" + "phpunit/phpunit": "^6.4" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.4.x-dev" + "dev-master": "1.6.x-dev" } }, "autoload": { @@ -223,37 +169,42 @@ "docblock", "parser" ], - "time": "2017-02-24T16:22:25+00:00" + "time": "2017-12-06T07:11:42+00:00" }, { "name": "doctrine/cache", - "version": "1.6.x-dev", + "version": "v1.8.0", "source": { "type": "git", "url": "https://github.com/doctrine/cache.git", - "reference": "eb152c5100571c7a45470ff2a35095ab3f3b900b" + "reference": "d768d58baee9a4862ca783840eca1b9add7a7f57" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/cache/zipball/eb152c5100571c7a45470ff2a35095ab3f3b900b", - "reference": "eb152c5100571c7a45470ff2a35095ab3f3b900b", + "url": "https://api.github.com/repos/doctrine/cache/zipball/d768d58baee9a4862ca783840eca1b9add7a7f57", + "reference": "d768d58baee9a4862ca783840eca1b9add7a7f57", "shasum": "" }, "require": { - "php": "~5.5|~7.0" + "php": "~7.1" }, "conflict": { "doctrine/common": ">2.2,<2.4" }, "require-dev": { - "phpunit/phpunit": "~4.8|~5.0", - "predis/predis": "~1.0", - "satooshi/php-coveralls": "~0.6" + "alcaeus/mongo-php-adapter": "^1.1", + "doctrine/coding-standard": "^4.0", + "mongodb/mongodb": "^1.1", + "phpunit/phpunit": "^7.0", + "predis/predis": "~1.0" + }, + "suggest": { + "alcaeus/mongo-php-adapter": "Required to use legacy MongoDB driver" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.6.x-dev" + "dev-master": "1.8.x-dev" } }, "autoload": { @@ -288,29 +239,29 @@ } ], "description": "Caching library offering an object-oriented API for many cache backends", - "homepage": "http://www.doctrine-project.org", + "homepage": "https://www.doctrine-project.org", "keywords": [ "cache", "caching" ], - "time": "2017-07-22T12:49:21+00:00" + "time": "2018-08-21T18:01:43+00:00" }, { "name": "doctrine/collections", - "version": "v1.4.0", + "version": "v1.5.0", "source": { "type": "git", "url": "https://github.com/doctrine/collections.git", - "reference": "1a4fb7e902202c33cce8c55989b945612943c2ba" + "reference": "a01ee38fcd999f34d9bfbcee59dbda5105449cbf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/collections/zipball/1a4fb7e902202c33cce8c55989b945612943c2ba", - "reference": "1a4fb7e902202c33cce8c55989b945612943c2ba", + "url": "https://api.github.com/repos/doctrine/collections/zipball/a01ee38fcd999f34d9bfbcee59dbda5105449cbf", + "reference": "a01ee38fcd999f34d9bfbcee59dbda5105449cbf", "shasum": "" }, "require": { - "php": "^5.6 || ^7.0" + "php": "^7.1" }, "require-dev": { "doctrine/coding-standard": "~0.1@dev", @@ -360,37 +311,43 @@ "collections", "iterator" ], - "time": "2017-01-03T10:49:41+00:00" + "time": "2017-07-22T10:37:32+00:00" }, { "name": "doctrine/common", - "version": "2.7.x-dev", + "version": "v2.10.0", "source": { "type": "git", "url": "https://github.com/doctrine/common.git", - "reference": "df88fc88463a60f228a8233acf3fa8664897229c" + "reference": "30e33f60f64deec87df728c02b107f82cdafad9d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/common/zipball/df88fc88463a60f228a8233acf3fa8664897229c", - "reference": "df88fc88463a60f228a8233acf3fa8664897229c", + "url": "https://api.github.com/repos/doctrine/common/zipball/30e33f60f64deec87df728c02b107f82cdafad9d", + "reference": "30e33f60f64deec87df728c02b107f82cdafad9d", "shasum": "" }, "require": { - "doctrine/annotations": "1.*", - "doctrine/cache": "1.*", - "doctrine/collections": "1.*", - "doctrine/inflector": "1.*", - "doctrine/lexer": "1.*", - "php": "~5.6|~7.0" + "doctrine/annotations": "^1.0", + "doctrine/cache": "^1.0", + "doctrine/collections": "^1.0", + "doctrine/event-manager": "^1.0", + "doctrine/inflector": "^1.0", + "doctrine/lexer": "^1.0", + "doctrine/persistence": "^1.1", + "doctrine/reflection": "^1.0", + "php": "^7.1" }, "require-dev": { - "phpunit/phpunit": "^5.4.6" + "doctrine/coding-standard": "^1.0", + "phpunit/phpunit": "^6.3", + "squizlabs/php_codesniffer": "^3.0", + "symfony/phpunit-bridge": "^4.0.5" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.7.x-dev" + "dev-master": "2.10.x-dev" } }, "autoload": { @@ -422,40 +379,49 @@ { "name": "Johannes Schmitt", "email": "schmittjoh@gmail.com" + }, + { + "name": "Marco Pivetta", + "email": "ocramius@gmail.com" } ], - "description": "Common Library for Doctrine projects", - "homepage": "http://www.doctrine-project.org", + "description": "PHP Doctrine Common project is a library that provides additional functionality that other Doctrine projects depend on such as better reflection support, persistence interfaces, proxies, event system and much more.", + "homepage": "https://www.doctrine-project.org/projects/common.html", "keywords": [ - "annotations", - "collections", - "eventmanager", - "persistence", - "spl" + "common", + "doctrine", + "php" ], - "time": "2017-07-22T08:35:55+00:00" + "time": "2018-11-21T01:24:55+00:00" }, { "name": "doctrine/dbal", - "version": "2.5.x-dev", + "version": "v2.8.0", "source": { "type": "git", "url": "https://github.com/doctrine/dbal.git", - "reference": "de23082f09b907ecc1593dd35fbdc49a392c50eb" + "reference": "5140a64c08b4b607b9bedaae0cedd26f04a0e621" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/dbal/zipball/de23082f09b907ecc1593dd35fbdc49a392c50eb", - "reference": "de23082f09b907ecc1593dd35fbdc49a392c50eb", + "url": "https://api.github.com/repos/doctrine/dbal/zipball/5140a64c08b4b607b9bedaae0cedd26f04a0e621", + "reference": "5140a64c08b4b607b9bedaae0cedd26f04a0e621", "shasum": "" }, "require": { - "doctrine/common": ">=2.4,<2.8-dev", - "php": ">=5.3.2" + "doctrine/cache": "^1.0", + "doctrine/event-manager": "^1.0", + "ext-pdo": "*", + "php": "^7.1" }, "require-dev": { - "phpunit/phpunit": "4.*", - "symfony/console": "2.*||^3.0" + "doctrine/coding-standard": "^4.0", + "jetbrains/phpstorm-stubs": "^2018.1.2", + "phpstan/phpstan": "^0.10.1", + "phpunit/phpunit": "^7.1.2", + "phpunit/phpunit-mock-objects": "!=3.2.4,!=3.2.5", + "symfony/console": "^2.0.5|^3.0|^4.0", + "symfony/phpunit-bridge": "^3.4.5|^4.0.5" }, "suggest": { "symfony/console": "For helpful console commands such as SQL execution and import of files." @@ -466,7 +432,8 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.5.x-dev" + "dev-master": "2.8.x-dev", + "dev-develop": "3.0.x-dev" } }, "autoload": { @@ -504,37 +471,111 @@ "persistence", "queryobject" ], - "time": "2018-04-02T10:40:57+00:00" + "time": "2018-07-13T03:16:35+00:00" }, { - "name": "doctrine/inflector", - "version": "1.1.x-dev", + "name": "doctrine/event-manager", + "version": "v1.0.0", "source": { "type": "git", - "url": "https://github.com/doctrine/inflector.git", - "reference": "90b2128806bfde671b6952ab8bea493942c1fdae" + "url": "https://github.com/doctrine/event-manager.git", + "reference": "a520bc093a0170feeb6b14e9d83f3a14452e64b3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/inflector/zipball/90b2128806bfde671b6952ab8bea493942c1fdae", - "reference": "90b2128806bfde671b6952ab8bea493942c1fdae", + "url": "https://api.github.com/repos/doctrine/event-manager/zipball/a520bc093a0170feeb6b14e9d83f3a14452e64b3", + "reference": "a520bc093a0170feeb6b14e9d83f3a14452e64b3", "shasum": "" }, "require": { - "php": ">=5.3.2" + "php": "^7.1" + }, + "conflict": { + "doctrine/common": "<2.9@dev" }, "require-dev": { - "phpunit/phpunit": "4.*" + "doctrine/coding-standard": "^4.0", + "phpunit/phpunit": "^7.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.1.x-dev" + "dev-master": "1.0.x-dev" } }, "autoload": { - "psr-0": { - "Doctrine\\Common\\Inflector\\": "lib/" + "psr-4": { + "Doctrine\\Common\\": "lib/Doctrine/Common" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Roman Borschel", + "email": "roman@code-factory.org" + }, + { + "name": "Benjamin Eberlei", + "email": "kontakt@beberlei.de" + }, + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com" + }, + { + "name": "Jonathan Wage", + "email": "jonwage@gmail.com" + }, + { + "name": "Johannes Schmitt", + "email": "schmittjoh@gmail.com" + }, + { + "name": "Marco Pivetta", + "email": "ocramius@gmail.com" + } + ], + "description": "Doctrine Event Manager component", + "homepage": "https://www.doctrine-project.org/projects/event-manager.html", + "keywords": [ + "event", + "eventdispatcher", + "eventmanager" + ], + "time": "2018-06-11T11:59:03+00:00" + }, + { + "name": "doctrine/inflector", + "version": "v1.3.0", + "source": { + "type": "git", + "url": "https://github.com/doctrine/inflector.git", + "reference": "5527a48b7313d15261292c149e55e26eae771b0a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/inflector/zipball/5527a48b7313d15261292c149e55e26eae771b0a", + "reference": "5527a48b7313d15261292c149e55e26eae771b0a", + "shasum": "" + }, + "require": { + "php": "^7.1" + }, + "require-dev": { + "phpunit/phpunit": "^6.2" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.3.x-dev" + } + }, + "autoload": { + "psr-4": { + "Doctrine\\Common\\Inflector\\": "lib/Doctrine/Common/Inflector" } }, "notification-url": "https://packagist.org/downloads/", @@ -571,36 +612,36 @@ "singularize", "string" ], - "time": "2015-11-06T14:35:42+00:00" + "time": "2018-01-09T20:05:19+00:00" }, { "name": "doctrine/instantiator", - "version": "1.0.x-dev", + "version": "1.1.0", "source": { "type": "git", "url": "https://github.com/doctrine/instantiator.git", - "reference": "83b5716aee90e1f733512942c635ac350cbd533c" + "reference": "185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/instantiator/zipball/83b5716aee90e1f733512942c635ac350cbd533c", - "reference": "83b5716aee90e1f733512942c635ac350cbd533c", + "url": "https://api.github.com/repos/doctrine/instantiator/zipball/185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda", + "reference": "185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda", "shasum": "" }, "require": { - "php": ">=5.3,<8.0-DEV" + "php": "^7.1" }, "require-dev": { "athletic/athletic": "~0.1.8", "ext-pdo": "*", "ext-phar": "*", - "phpunit/phpunit": "~4.0", - "squizlabs/php_codesniffer": "~2.0" + "phpunit/phpunit": "^6.2.3", + "squizlabs/php_codesniffer": "^3.0.2" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "1.2.x-dev" } }, "autoload": { @@ -625,28 +666,25 @@ "constructor", "instantiate" ], - "time": "2018-09-01T02:07:49+00:00" + "time": "2017-07-22T11:58:36+00:00" }, { "name": "doctrine/lexer", - "version": "dev-master", + "version": "v1.0.1", "source": { "type": "git", "url": "https://github.com/doctrine/lexer.git", - "reference": "4ab6ea7c838ccb340883fd78915af079949cc64d" + "reference": "83893c552fd2045dd78aef794c31e694c37c0b8c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/lexer/zipball/4ab6ea7c838ccb340883fd78915af079949cc64d", - "reference": "4ab6ea7c838ccb340883fd78915af079949cc64d", + "url": "https://api.github.com/repos/doctrine/lexer/zipball/83893c552fd2045dd78aef794c31e694c37c0b8c", + "reference": "83893c552fd2045dd78aef794c31e694c37c0b8c", "shasum": "" }, "require": { "php": ">=5.3.2" }, - "require-dev": { - "phpunit/phpunit": "^4.5" - }, "type": "library", "extra": { "branch-alias": { @@ -654,8 +692,8 @@ } }, "autoload": { - "psr-4": { - "Doctrine\\Common\\Lexer\\": "lib/Doctrine/Common/Lexer" + "psr-0": { + "Doctrine\\Common\\Lexer\\": "lib/" } }, "notification-url": "https://packagist.org/downloads/", @@ -676,51 +714,50 @@ "email": "schmittjoh@gmail.com" } ], - "description": "PHP Doctrine Lexer parser library that can be used in Top-Down, Recursive Descent Parsers.", - "homepage": "https://www.doctrine-project.org/projects/lexer.html", + "description": "Base library for a lexer that can be used in Top-Down, Recursive Descent Parsers.", + "homepage": "http://www.doctrine-project.org", "keywords": [ - "annotations", - "docblock", "lexer", - "parser", - "php" + "parser" ], - "time": "2018-10-21T19:22:05+00:00" + "time": "2014-09-09T13:34:57+00:00" }, { "name": "doctrine/orm", - "version": "2.5.x-dev", + "version": "v2.6.3", "source": { "type": "git", "url": "https://github.com/doctrine/doctrine2.git", - "reference": "19db7510a7b49605a9139fc2964342a98a682a8c" + "reference": "434820973cadf2da2d66e7184be370084cc32ca8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/doctrine2/zipball/19db7510a7b49605a9139fc2964342a98a682a8c", - "reference": "19db7510a7b49605a9139fc2964342a98a682a8c", + "url": "https://api.github.com/repos/doctrine/doctrine2/zipball/434820973cadf2da2d66e7184be370084cc32ca8", + "reference": "434820973cadf2da2d66e7184be370084cc32ca8", "shasum": "" }, "require": { - "doctrine/cache": "~1.4", - "doctrine/collections": "~1.2", - "doctrine/common": ">=2.5-dev,<2.9-dev", - "doctrine/dbal": ">=2.5-dev,<2.7-dev", - "doctrine/instantiator": "^1.0.1", + "doctrine/annotations": "~1.5", + "doctrine/cache": "~1.6", + "doctrine/collections": "^1.4", + "doctrine/common": "^2.7.1", + "doctrine/dbal": "^2.6", + "doctrine/instantiator": "~1.1", "ext-pdo": "*", - "php": ">=5.4", - "symfony/console": "~2.5|~3.0|~4.0" + "php": "^7.1", + "symfony/console": "~3.0|~4.0" }, "require-dev": { - "phpunit/phpunit": "~4.0", - "symfony/yaml": "~2.3|~3.0|~4.0" + "doctrine/coding-standard": "^1.0", + "phpunit/phpunit": "^6.5", + "squizlabs/php_codesniffer": "^3.2", + "symfony/yaml": "~3.4|~4.0" }, "suggest": { "symfony/yaml": "If you want to use YAML Metadata Mapping Driver" }, "bin": [ - "bin/doctrine", - "bin/doctrine.php" + "bin/doctrine" ], "type": "library", "extra": { @@ -729,8 +766,8 @@ } }, "autoload": { - "psr-0": { - "Doctrine\\ORM\\": "lib/" + "psr-4": { + "Doctrine\\ORM\\": "lib/Doctrine/ORM" } }, "notification-url": "https://packagist.org/downloads/", @@ -753,6 +790,10 @@ { "name": "Jonathan Wage", "email": "jonwage@gmail.com" + }, + { + "name": "Marco Pivetta", + "email": "ocramius@gmail.com" } ], "description": "Object-Relational-Mapper for PHP", @@ -761,11 +802,274 @@ "database", "orm" ], - "time": "2017-12-17T03:03:07+00:00" + "time": "2018-11-20T23:46:46+00:00" + }, + { + "name": "doctrine/persistence", + "version": "v1.1.0", + "source": { + "type": "git", + "url": "https://github.com/doctrine/persistence.git", + "reference": "c0f1c17602afc18b4cbd8e1c8125f264c9cf7d38" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/persistence/zipball/c0f1c17602afc18b4cbd8e1c8125f264c9cf7d38", + "reference": "c0f1c17602afc18b4cbd8e1c8125f264c9cf7d38", + "shasum": "" + }, + "require": { + "doctrine/annotations": "^1.0", + "doctrine/cache": "^1.0", + "doctrine/collections": "^1.0", + "doctrine/event-manager": "^1.0", + "doctrine/reflection": "^1.0", + "php": "^7.1" + }, + "conflict": { + "doctrine/common": "<2.10@dev" + }, + "require-dev": { + "doctrine/coding-standard": "^5.0", + "phpstan/phpstan": "^0.8", + "phpunit/phpunit": "^7.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Doctrine\\Common\\": "lib/Doctrine/Common" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Roman Borschel", + "email": "roman@code-factory.org" + }, + { + "name": "Benjamin Eberlei", + "email": "kontakt@beberlei.de" + }, + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com" + }, + { + "name": "Jonathan Wage", + "email": "jonwage@gmail.com" + }, + { + "name": "Johannes Schmitt", + "email": "schmittjoh@gmail.com" + }, + { + "name": "Marco Pivetta", + "email": "ocramius@gmail.com" + } + ], + "description": "The Doctrine Persistence project is a set of shared interfaces and functionality that the different Doctrine object mappers share.", + "homepage": "https://doctrine-project.org/projects/persistence.html", + "keywords": [ + "mapper", + "object", + "odm", + "orm", + "persistence" + ], + "time": "2018-11-21T00:33:13+00:00" + }, + { + "name": "doctrine/reflection", + "version": "v1.0.0", + "source": { + "type": "git", + "url": "https://github.com/doctrine/reflection.git", + "reference": "02538d3f95e88eb397a5f86274deb2c6175c2ab6" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/reflection/zipball/02538d3f95e88eb397a5f86274deb2c6175c2ab6", + "reference": "02538d3f95e88eb397a5f86274deb2c6175c2ab6", + "shasum": "" + }, + "require": { + "doctrine/annotations": "^1.0", + "ext-tokenizer": "*", + "php": "^7.1" + }, + "require-dev": { + "doctrine/coding-standard": "^4.0", + "doctrine/common": "^2.8", + "phpstan/phpstan": "^0.9.2", + "phpstan/phpstan-phpunit": "^0.9.4", + "phpunit/phpunit": "^7.0", + "squizlabs/php_codesniffer": "^3.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Doctrine\\Common\\": "lib/Doctrine/Common" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Roman Borschel", + "email": "roman@code-factory.org" + }, + { + "name": "Benjamin Eberlei", + "email": "kontakt@beberlei.de" + }, + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com" + }, + { + "name": "Jonathan Wage", + "email": "jonwage@gmail.com" + }, + { + "name": "Johannes Schmitt", + "email": "schmittjoh@gmail.com" + }, + { + "name": "Marco Pivetta", + "email": "ocramius@gmail.com" + } + ], + "description": "Doctrine Reflection component", + "homepage": "https://www.doctrine-project.org/projects/reflection.html", + "keywords": [ + "reflection" + ], + "time": "2018-06-14T14:45:07+00:00" + }, + { + "name": "dragonmantank/cron-expression", + "version": "v2.2.0", + "source": { + "type": "git", + "url": "https://github.com/dragonmantank/cron-expression.git", + "reference": "92a2c3768d50e21a1f26a53cb795ce72806266c5" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/dragonmantank/cron-expression/zipball/92a2c3768d50e21a1f26a53cb795ce72806266c5", + "reference": "92a2c3768d50e21a1f26a53cb795ce72806266c5", + "shasum": "" + }, + "require": { + "php": ">=7.0.0" + }, + "require-dev": { + "phpunit/phpunit": "~6.4" + }, + "type": "library", + "autoload": { + "psr-4": { + "Cron\\": "src/Cron/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Michael Dowling", + "email": "mtdowling@gmail.com", + "homepage": "https://github.com/mtdowling" + }, + { + "name": "Chris Tankersley", + "email": "chris@ctankersley.com", + "homepage": "https://github.com/dragonmantank" + } + ], + "description": "CRON for PHP: Calculate the next or previous run date and determine if a CRON expression is due", + "keywords": [ + "cron", + "schedule" + ], + "time": "2018-06-06T03:12:17+00:00" + }, + { + "name": "egulias/email-validator", + "version": "2.1.6", + "source": { + "type": "git", + "url": "https://github.com/egulias/EmailValidator.git", + "reference": "0578b32b30b22de3e8664f797cf846fc9246f786" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/0578b32b30b22de3e8664f797cf846fc9246f786", + "reference": "0578b32b30b22de3e8664f797cf846fc9246f786", + "shasum": "" + }, + "require": { + "doctrine/lexer": "^1.0.1", + "php": ">= 5.5" + }, + "require-dev": { + "dominicsayers/isemail": "dev-master", + "phpunit/phpunit": "^4.8.35||^5.7||^6.0", + "satooshi/php-coveralls": "^1.0.1" + }, + "suggest": { + "ext-intl": "PHP Internationalization Libraries are required to use the SpoofChecking validation" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Egulias\\EmailValidator\\": "EmailValidator" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Eduardo Gulias Davis" + } + ], + "description": "A library for validating emails against several RFCs", + "homepage": "https://github.com/egulias/EmailValidator", + "keywords": [ + "email", + "emailvalidation", + "emailvalidator", + "validation", + "validator" + ], + "time": "2018-09-25T20:47:26+00:00" }, { "name": "eluceo/ical", - "version": "0.11.x-dev", + "version": "0.11.6", "source": { "type": "git", "url": "https://github.com/markuspoerschke/iCal.git", @@ -819,6 +1123,52 @@ ], "time": "2018-04-30T07:46:32+00:00" }, + { + "name": "erusev/parsedown", + "version": "1.7.1", + "source": { + "type": "git", + "url": "https://github.com/erusev/parsedown.git", + "reference": "92e9c27ba0e74b8b028b111d1b6f956a15c01fc1" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/erusev/parsedown/zipball/92e9c27ba0e74b8b028b111d1b6f956a15c01fc1", + "reference": "92e9c27ba0e74b8b028b111d1b6f956a15c01fc1", + "shasum": "" + }, + "require": { + "ext-mbstring": "*", + "php": ">=5.3.0" + }, + "require-dev": { + "phpunit/phpunit": "^4.8.35" + }, + "type": "library", + "autoload": { + "psr-0": { + "Parsedown": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Emanuil Rusev", + "email": "hello@erusev.com", + "homepage": "http://erusev.com" + } + ], + "description": "Parser for Markdown.", + "homepage": "http://parsedown.org", + "keywords": [ + "markdown", + "parser" + ], + "time": "2018-03-08T01:11:30+00:00" + }, { "name": "ezyang/htmlpurifier", "version": "v4.7.0", @@ -863,6 +1213,60 @@ ], "time": "2015-08-05T01:03:42+00:00" }, + { + "name": "fideloper/proxy", + "version": "4.0.0", + "source": { + "type": "git", + "url": "https://github.com/fideloper/TrustedProxy.git", + "reference": "cf8a0ca4b85659b9557e206c90110a6a4dba980a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/fideloper/TrustedProxy/zipball/cf8a0ca4b85659b9557e206c90110a6a4dba980a", + "reference": "cf8a0ca4b85659b9557e206c90110a6a4dba980a", + "shasum": "" + }, + "require": { + "illuminate/contracts": "~5.0", + "php": ">=5.4.0" + }, + "require-dev": { + "illuminate/http": "~5.6", + "mockery/mockery": "~1.0", + "phpunit/phpunit": "^6.0" + }, + "type": "library", + "extra": { + "laravel": { + "providers": [ + "Fideloper\\Proxy\\TrustedProxyServiceProvider" + ] + } + }, + "autoload": { + "psr-4": { + "Fideloper\\Proxy\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Chris Fidao", + "email": "fideloper@gmail.com" + } + ], + "description": "Set trusted proxies for Laravel", + "keywords": [ + "load balancing", + "proxy", + "trusted proxy" + ], + "time": "2018-02-07T20:20:57+00:00" + }, { "name": "firebase/php-jwt", "version": "v5.0.0", @@ -948,16 +1352,16 @@ }, { "name": "google/apiclient", - "version": "dev-master", + "version": "v2.2.2", "source": { "type": "git", "url": "https://github.com/googleapis/google-api-php-client.git", - "reference": "89b3b8c28cdaa709950995f375539429c064d2e5" + "reference": "4e0fd83510e579043e10e565528b323b7c2b3c81" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/googleapis/google-api-php-client/zipball/89b3b8c28cdaa709950995f375539429c064d2e5", - "reference": "89b3b8c28cdaa709950995f375539429c064d2e5", + "url": "https://api.github.com/repos/googleapis/google-api-php-client/zipball/4e0fd83510e579043e10e565528b323b7c2b3c81", + "reference": "4e0fd83510e579043e10e565528b323b7c2b3c81", "shasum": "" }, "require": { @@ -1003,7 +1407,7 @@ "keywords": [ "google" ], - "time": "2018-10-17T00:07:47+00:00" + "time": "2018-06-20T15:52:20+00:00" }, { "name": "google/apiclient-services", @@ -1091,16 +1495,16 @@ }, { "name": "guzzlehttp/guzzle", - "version": "dev-master", + "version": "6.3.3", "source": { "type": "git", "url": "https://github.com/guzzle/guzzle.git", - "reference": "35b2c9f2a91f9ad4e6a5210ee800a6a05edaeef3" + "reference": "407b0cb880ace85c9b63c5f9551db498cb2d50ba" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/35b2c9f2a91f9ad4e6a5210ee800a6a05edaeef3", - "reference": "35b2c9f2a91f9ad4e6a5210ee800a6a05edaeef3", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/407b0cb880ace85c9b63c5f9551db498cb2d50ba", + "reference": "407b0cb880ace85c9b63c5f9551db498cb2d50ba", "shasum": "" }, "require": { @@ -1152,27 +1556,27 @@ "rest", "web service" ], - "time": "2018-10-31T23:06:20+00:00" + "time": "2018-04-22T15:46:56+00:00" }, { "name": "guzzlehttp/promises", - "version": "dev-master", + "version": "v1.3.1", "source": { "type": "git", "url": "https://github.com/guzzle/promises.git", - "reference": "926eaa3ff73cde2becf652b785831bcb7618568a" + "reference": "a59da6cf61d80060647ff4d3eb2c03a2bc694646" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/promises/zipball/926eaa3ff73cde2becf652b785831bcb7618568a", - "reference": "926eaa3ff73cde2becf652b785831bcb7618568a", + "url": "https://api.github.com/repos/guzzle/promises/zipball/a59da6cf61d80060647ff4d3eb2c03a2bc694646", + "reference": "a59da6cf61d80060647ff4d3eb2c03a2bc694646", "shasum": "" }, "require": { "php": ">=5.5.0" }, "require-dev": { - "phpunit/phpunit": "^4.8.36" + "phpunit/phpunit": "^4.0" }, "type": "library", "extra": { @@ -1203,37 +1607,36 @@ "keywords": [ "promise" ], - "time": "2018-10-30T00:20:04+00:00" + "time": "2016-12-20T10:07:11+00:00" }, { "name": "guzzlehttp/psr7", - "version": "dev-master", + "version": "1.4.2", "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "001c9779bb0b90d2abdbb794ba784352827218a9" + "reference": "f5b8a8512e2b58b0071a7280e39f14f72e05d87c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/001c9779bb0b90d2abdbb794ba784352827218a9", - "reference": "001c9779bb0b90d2abdbb794ba784352827218a9", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/f5b8a8512e2b58b0071a7280e39f14f72e05d87c", + "reference": "f5b8a8512e2b58b0071a7280e39f14f72e05d87c", "shasum": "" }, "require": { "php": ">=5.4.0", - "psr/http-message": "~1.0", - "ralouphie/getallheaders": "^2.0.5" + "psr/http-message": "~1.0" }, "provide": { "psr/http-message-implementation": "1.0" }, "require-dev": { - "phpunit/phpunit": "~4.8.36 || ^5.7.27 || ^6.5.8" + "phpunit/phpunit": "~4.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.5-dev" + "dev-master": "1.4-dev" } }, "autoload": { @@ -1263,14 +1666,13 @@ "keywords": [ "http", "message", - "psr-7", "request", "response", "stream", "uri", "url" ], - "time": "2018-11-01T01:32:36+00:00" + "time": "2017-03-20T17:10:46+00:00" }, { "name": "idct/sftp-client", @@ -1278,12 +1680,12 @@ "source": { "type": "git", "url": "https://github.com/ideaconnect/idct-sftp-client.git", - "reference": "b079289ade53c5e9d21ac9bdf9bf2882962214fb" + "reference": "74775640940a53dd43c6e9176f73acdbaced0cea" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ideaconnect/idct-sftp-client/zipball/b079289ade53c5e9d21ac9bdf9bf2882962214fb", - "reference": "b079289ade53c5e9d21ac9bdf9bf2882962214fb", + "url": "https://api.github.com/repos/ideaconnect/idct-sftp-client/zipball/74775640940a53dd43c6e9176f73acdbaced0cea", + "reference": "74775640940a53dd43c6e9176f73acdbaced0cea", "shasum": "" }, "require": { @@ -1322,49 +1724,7 @@ "ssh", "ssh2" ], - "time": "2018-06-04T20:48:31+00:00" - }, - { - "name": "ircmaxell/password-compat", - "version": "1.0.x-dev", - "source": { - "type": "git", - "url": "https://github.com/ircmaxell/password_compat.git", - "reference": "9b99377557a33a4129c9194e60a97a685fab21e0" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/ircmaxell/password_compat/zipball/9b99377557a33a4129c9194e60a97a685fab21e0", - "reference": "9b99377557a33a4129c9194e60a97a685fab21e0", - "shasum": "" - }, - "require-dev": { - "phpunit/phpunit": "4.*" - }, - "type": "library", - "autoload": { - "files": [ - "lib/password.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Anthony Ferrara", - "email": "ircmaxell@php.net", - "homepage": "http://blog.ircmaxell.com" - } - ], - "description": "A compatibility library for the proposed simplified password hashing algorithm: https://wiki.php.net/rfc/password_hash", - "homepage": "https://github.com/ircmaxell/password_compat", - "keywords": [ - "hashing", - "password" - ], - "time": "2014-11-20T19:18:42+00:00" + "time": "2018-11-18T12:45:12+00:00" }, { "name": "jakub-onderka/php-console-color", @@ -1453,36 +1813,39 @@ "time": "2015-04-20T18:58:01+00:00" }, { - "name": "jeremeamia/SuperClosure", - "version": "dev-master", + "name": "justinrainbow/json-schema", + "version": "5.2.7", "source": { "type": "git", - "url": "https://github.com/jeremeamia/super_closure.git", - "reference": "5707d5821b30b9a07acfb4d76949784aaa0e9ce9" + "url": "https://github.com/justinrainbow/json-schema.git", + "reference": "8560d4314577199ba51bf2032f02cd1315587c23" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/jeremeamia/super_closure/zipball/5707d5821b30b9a07acfb4d76949784aaa0e9ce9", - "reference": "5707d5821b30b9a07acfb4d76949784aaa0e9ce9", + "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/8560d4314577199ba51bf2032f02cd1315587c23", + "reference": "8560d4314577199ba51bf2032f02cd1315587c23", "shasum": "" }, "require": { - "nikic/php-parser": "^1.2|^2.0|^3.0|^4.0", - "php": ">=5.4", - "symfony/polyfill-php56": "^1.0" + "php": ">=5.3.3" }, "require-dev": { - "phpunit/phpunit": "^4.0|^5.0" + "friendsofphp/php-cs-fixer": "^2.1", + "json-schema/json-schema-test-suite": "1.2.0", + "phpunit/phpunit": "^4.8.35" }, + "bin": [ + "bin/validate-json" + ], "type": "library", "extra": { "branch-alias": { - "dev-master": "2.4-dev" + "dev-master": "5.0.x-dev" } }, "autoload": { "psr-4": { - "SuperClosure\\": "src/" + "JsonSchema\\": "src/JsonSchema/" } }, "notification-url": "https://packagist.org/downloads/", @@ -1491,28 +1854,33 @@ ], "authors": [ { - "name": "Jeremy Lindblom", - "email": "jeremeamia@gmail.com", - "homepage": "https://github.com/jeremeamia", - "role": "Developer" + "name": "Bruno Prieto Reis", + "email": "bruno.p.reis@gmail.com" + }, + { + "name": "Justin Rainbow", + "email": "justin.rainbow@gmail.com" + }, + { + "name": "Igor Wiedler", + "email": "igor@wiedler.ch" + }, + { + "name": "Robert Schönthal", + "email": "seroscho@googlemail.com" } ], - "description": "Serialize Closure objects, including their context and binding", - "homepage": "https://github.com/jeremeamia/super_closure", + "description": "A library to validate a json schema.", + "homepage": "https://github.com/justinrainbow/json-schema", "keywords": [ - "closure", - "function", - "lambda", - "parser", - "serializable", - "serialize", - "tokenizer" + "json", + "schema" ], - "time": "2018-03-21T22:21:57+00:00" + "time": "2018-02-14T22:26:30+00:00" }, { "name": "laravel-doctrine/extensions", - "version": "1.0.x-dev", + "version": "1.0.14", "source": { "type": "git", "url": "https://github.com/laravel-doctrine/extensions.git", @@ -1573,40 +1941,40 @@ }, { "name": "laravel-doctrine/orm", - "version": "1.2.x-dev", + "version": "1.4.9", "source": { "type": "git", "url": "https://github.com/laravel-doctrine/orm.git", - "reference": "6a92c3458e82aa659d7bf066dfa15e7bbc3447d5" + "reference": "5a004509adccc2cfc2143df6101852e2fab4a048" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel-doctrine/orm/zipball/6a92c3458e82aa659d7bf066dfa15e7bbc3447d5", - "reference": "6a92c3458e82aa659d7bf066dfa15e7bbc3447d5", + "url": "https://api.github.com/repos/laravel-doctrine/orm/zipball/5a004509adccc2cfc2143df6101852e2fab4a048", + "reference": "5a004509adccc2cfc2143df6101852e2fab4a048", "shasum": "" }, "require": { - "doctrine/orm": "2.5.*", - "illuminate/auth": "5.2.*|5.3.*", - "illuminate/console": "5.2.*|5.3.*", - "illuminate/container": "5.2.*|5.3.*", - "illuminate/contracts": "5.2.*|5.3.*", - "illuminate/pagination": "5.2.*|5.3.*", - "illuminate/routing": "5.2.*|5.3.*", - "illuminate/support": "5.2.*|5.3.*", - "illuminate/validation": "5.2.*|5.3.*", - "illuminate/view": "5.2.*|5.3.*", - "php": ">=5.5.9", - "symfony/serializer": "^2.7" + "doctrine/orm": "2.5.*|2.6.*", + "illuminate/auth": "5.5.*|5.6.*|5.7.*", + "illuminate/console": "5.5.*|5.6.*|5.7.*", + "illuminate/container": "5.5.*|5.6.*|5.7.*", + "illuminate/contracts": "5.5.*|5.6.*|5.7.*", + "illuminate/pagination": "5.5.*|5.6.*|5.7.*", + "illuminate/routing": "5.5.*|5.6.*|5.7.*", + "illuminate/support": "5.5.*|5.6.*|5.7.*", + "illuminate/validation": "5.5.*|5.6.*|5.7.*", + "illuminate/view": "5.5.*|5.6.*|5.7.*", + "php": ">=7.0", + "symfony/serializer": "^2.7|~3.0|~4.0" }, "require-dev": { "barryvdh/laravel-debugbar": "~2.0", - "illuminate/log": "5.2.*|5.3.*", - "illuminate/notifications": "5.3.*", - "illuminate/queue": "5.3.*", + "illuminate/log": "5.5.*|5.6.*|5.7.*", + "illuminate/notifications": "5.5.*|5.6.*|5.7.*", + "illuminate/queue": "5.5.*|5.6.*|5.7.*", "itsgoingd/clockwork": "~1.9", - "mockery/mockery": "~0.9", - "phpunit/phpunit": "~4.0" + "mockery/mockery": "^1.0", + "phpunit/phpunit": "~5.0" }, "suggest": { "fzaninotto/faker": "Required to use the entity factory builder (~1.4).", @@ -1617,6 +1985,18 @@ "yajra/laravel-oci8": "Support for Laravel native queue and session database drivers in Oracle (~2.0)." }, "type": "library", + "extra": { + "laravel": { + "providers": [ + "LaravelDoctrine\\ORM\\DoctrineServiceProvider" + ], + "aliases": { + "Registry": "LaravelDoctrine\\ORM\\Facades\\Registry", + "Doctrine": "LaravelDoctrine\\ORM\\Facades\\Doctrine", + "EntityManager": "LaravelDoctrine\\ORM\\Facades\\EntityManager" + } + } + }, "autoload": { "psr-4": { "LaravelDoctrine\\ORM\\": "src/" @@ -1643,48 +2023,50 @@ "laravel", "orm" ], - "time": "2017-04-12T12:45:15+00:00" + "time": "2018-09-03T11:51:54+00:00" }, { "name": "laravel/framework", - "version": "5.3.x-dev", + "version": "v5.6.39", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "2906b572aa83ff46b8ad57093dd0e859c0ff783f" + "reference": "37bb306f516669ab4f888c16003f694313ab299e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/2906b572aa83ff46b8ad57093dd0e859c0ff783f", - "reference": "2906b572aa83ff46b8ad57093dd0e859c0ff783f", + "url": "https://api.github.com/repos/laravel/framework/zipball/37bb306f516669ab4f888c16003f694313ab299e", + "reference": "37bb306f516669ab4f888c16003f694313ab299e", "shasum": "" }, "require": { - "classpreloader/classpreloader": "~3.0", - "doctrine/inflector": "~1.0", + "doctrine/inflector": "~1.1", + "dragonmantank/cron-expression": "~2.0", + "erusev/parsedown": "~1.7", "ext-mbstring": "*", "ext-openssl": "*", - "jeremeamia/superclosure": "~2.2", - "league/flysystem": "~1.0", - "monolog/monolog": "~1.11", - "mtdowling/cron-expression": "~1.0", - "nesbot/carbon": "~1.20", - "paragonie/random_compat": "~1.4|~2.0", - "php": ">=5.6.4", - "psy/psysh": "0.7.*|0.8.*", - "ramsey/uuid": "~3.0", - "swiftmailer/swiftmailer": "~5.4", - "symfony/console": "3.1.*", - "symfony/debug": "3.1.*", - "symfony/finder": "3.1.*", - "symfony/http-foundation": "3.1.*", - "symfony/http-kernel": "3.1.*", - "symfony/process": "3.1.*", - "symfony/routing": "3.1.*", - "symfony/translation": "3.1.*", - "symfony/var-dumper": "3.1.*", + "league/flysystem": "^1.0.8", + "monolog/monolog": "~1.12", + "nesbot/carbon": "1.25.*", + "php": "^7.1.3", + "psr/container": "~1.0", + "psr/simple-cache": "^1.0", + "ramsey/uuid": "^3.7", + "swiftmailer/swiftmailer": "~6.0", + "symfony/console": "~4.0", + "symfony/debug": "~4.0", + "symfony/finder": "~4.0", + "symfony/http-foundation": "~4.0", + "symfony/http-kernel": "~4.0", + "symfony/process": "~4.0", + "symfony/routing": "~4.0", + "symfony/var-dumper": "~4.0", + "tijsverkoyen/css-to-inline-styles": "^2.2.1", "vlucas/phpdotenv": "~2.2" }, + "conflict": { + "tightenco/collect": "<5.5.33" + }, "replace": { "illuminate/auth": "self.version", "illuminate/broadcasting": "self.version", @@ -1698,7 +2080,6 @@ "illuminate/database": "self.version", "illuminate/encryption": "self.version", "illuminate/events": "self.version", - "illuminate/exception": "self.version", "illuminate/filesystem": "self.version", "illuminate/hashing": "self.version", "illuminate/http": "self.version", @@ -1714,36 +2095,46 @@ "illuminate/support": "self.version", "illuminate/translation": "self.version", "illuminate/validation": "self.version", - "illuminate/view": "self.version", - "tightenco/collect": "self.version" + "illuminate/view": "self.version" }, "require-dev": { "aws/aws-sdk-php": "~3.0", - "mockery/mockery": "~0.9.4", + "doctrine/dbal": "~2.6", + "filp/whoops": "^2.1.4", + "league/flysystem-cached-adapter": "~1.0", + "mockery/mockery": "~1.0", + "moontoast/math": "^1.1", + "orchestra/testbench-core": "3.6.*", "pda/pheanstalk": "~3.0", - "phpunit/phpunit": "~5.4", - "predis/predis": "~1.0", - "symfony/css-selector": "3.1.*", - "symfony/dom-crawler": "3.1.*" + "phpunit/phpunit": "~7.0", + "predis/predis": "^1.1.1", + "symfony/css-selector": "~4.0", + "symfony/dom-crawler": "~4.0" }, "suggest": { "aws/aws-sdk-php": "Required to use the SQS queue driver and SES mail driver (~3.0).", - "doctrine/dbal": "Required to rename columns and drop SQLite columns (~2.4).", + "doctrine/dbal": "Required to rename columns and drop SQLite columns (~2.6).", + "ext-pcntl": "Required to use all features of the queue worker.", + "ext-posix": "Required to use all features of the queue worker.", "fzaninotto/faker": "Required to use the eloquent factory builder (~1.4).", - "guzzlehttp/guzzle": "Required to use the Mailgun and Mandrill mail drivers and the ping methods on schedules (~5.3|~6.0).", + "guzzlehttp/guzzle": "Required to use the Mailgun and Mandrill mail drivers and the ping methods on schedules (~6.0).", + "laravel/tinker": "Required to use the tinker console command (~1.0).", "league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (~1.0).", + "league/flysystem-cached-adapter": "Required to use the Flysystem cache (~1.0).", "league/flysystem-rackspace": "Required to use the Flysystem Rackspace driver (~1.0).", + "league/flysystem-sftp": "Required to use the Flysystem SFTP driver (~1.0).", + "nexmo/client": "Required to use the Nexmo transport (~1.0).", "pda/pheanstalk": "Required to use the beanstalk queue driver (~3.0).", "predis/predis": "Required to use the redis cache and queue drivers (~1.0).", - "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (~2.0).", - "symfony/css-selector": "Required to use some of the crawler integration testing tools (3.1.*).", - "symfony/dom-crawler": "Required to use most of the crawler integration testing tools (3.1.*).", - "symfony/psr-http-message-bridge": "Required to use psr7 bridging features (0.2.*)." + "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (~3.0).", + "symfony/css-selector": "Required to use some of the crawler integration testing tools (~4.0).", + "symfony/dom-crawler": "Required to use most of the crawler integration testing tools (~4.0).", + "symfony/psr-http-message-bridge": "Required to psr7 bridging features (~1.0)." }, "type": "library", "extra": { "branch-alias": { - "dev-master": "5.3-dev" + "dev-master": "5.6-dev" } }, "autoload": { @@ -1771,20 +2162,83 @@ "framework", "laravel" ], - "time": "2018-01-19T13:47:22+00:00" + "time": "2018-10-04T14:50:41+00:00" }, { - "name": "league/flysystem", - "version": "dev-master", + "name": "laravel/tinker", + "version": "v1.0.8", "source": { "type": "git", - "url": "https://github.com/thephpleague/flysystem.git", - "reference": "35860849cec108740060a5151776d84d6756c91f" + "url": "https://github.com/laravel/tinker.git", + "reference": "cafbf598a90acde68985660e79b2b03c5609a405" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/35860849cec108740060a5151776d84d6756c91f", - "reference": "35860849cec108740060a5151776d84d6756c91f", + "url": "https://api.github.com/repos/laravel/tinker/zipball/cafbf598a90acde68985660e79b2b03c5609a405", + "reference": "cafbf598a90acde68985660e79b2b03c5609a405", + "shasum": "" + }, + "require": { + "illuminate/console": "~5.1", + "illuminate/contracts": "~5.1", + "illuminate/support": "~5.1", + "php": ">=5.5.9", + "psy/psysh": "0.7.*|0.8.*|0.9.*", + "symfony/var-dumper": "~3.0|~4.0" + }, + "require-dev": { + "phpunit/phpunit": "~4.0|~5.0" + }, + "suggest": { + "illuminate/database": "The Illuminate Database package (~5.1)." + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + }, + "laravel": { + "providers": [ + "Laravel\\Tinker\\TinkerServiceProvider" + ] + } + }, + "autoload": { + "psr-4": { + "Laravel\\Tinker\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Taylor Otwell", + "email": "taylor@laravel.com" + } + ], + "description": "Powerful REPL for the Laravel framework.", + "keywords": [ + "REPL", + "Tinker", + "laravel", + "psysh" + ], + "time": "2018-10-12T19:39:35+00:00" + }, + { + "name": "league/flysystem", + "version": "1.0.48", + "source": { + "type": "git", + "url": "https://github.com/thephpleague/flysystem.git", + "reference": "a6ded5b2f6055e2db97b4b859fdfca2b952b78aa" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/a6ded5b2f6055e2db97b4b859fdfca2b952b78aa", + "reference": "a6ded5b2f6055e2db97b4b859fdfca2b952b78aa", "shasum": "" }, "require": { @@ -1855,25 +2309,25 @@ "sftp", "storage" ], - "time": "2018-10-27T10:18:21+00:00" + "time": "2018-10-15T13:53:10+00:00" }, { "name": "league/oauth2-client", - "version": "2.3.0", + "version": "2.3.1", "source": { "type": "git", "url": "https://github.com/thephpleague/oauth2-client.git", - "reference": "aa2e3df188f0bfd87f7880cc880e906e99923580" + "reference": "4dfceb5b25fe89dba7034de75bb097dfb2ec4b46" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/oauth2-client/zipball/aa2e3df188f0bfd87f7880cc880e906e99923580", - "reference": "aa2e3df188f0bfd87f7880cc880e906e99923580", + "url": "https://api.github.com/repos/thephpleague/oauth2-client/zipball/4dfceb5b25fe89dba7034de75bb097dfb2ec4b46", + "reference": "4dfceb5b25fe89dba7034de75bb097dfb2ec4b46", "shasum": "" }, "require": { "guzzlehttp/guzzle": "^6.0", - "paragonie/random_compat": "^1|^2", + "paragonie/random_compat": "^1|^2|^9.99", "php": "^5.6|^7.0" }, "require-dev": { @@ -1922,20 +2376,20 @@ "oauth2", "single sign on" ], - "time": "2018-01-13T05:27:58+00:00" + "time": "2018-11-19T23:15:14+00:00" }, { "name": "monolog/monolog", - "version": "1.x-dev", + "version": "1.24.0", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "c465e1144536862e03f519cb3d65e924062cabfb" + "reference": "bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/c465e1144536862e03f519cb3d65e924062cabfb", - "reference": "c465e1144536862e03f519cb3d65e924062cabfb", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266", + "reference": "bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266", "shasum": "" }, "require": { @@ -2000,64 +2454,20 @@ "logging", "psr-3" ], - "time": "2018-06-19T07:22:34+00:00" - }, - { - "name": "mtdowling/cron-expression", - "version": "v1.2.1.x-dev", - "source": { - "type": "git", - "url": "https://github.com/mtdowling/cron-expression.git", - "reference": "9504fa9ea681b586028adaaa0877db4aecf32bad" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/mtdowling/cron-expression/zipball/9504fa9ea681b586028adaaa0877db4aecf32bad", - "reference": "9504fa9ea681b586028adaaa0877db4aecf32bad", - "shasum": "" - }, - "require": { - "php": ">=5.3.2" - }, - "require-dev": { - "phpunit/phpunit": "~4.0|~5.0" - }, - "type": "library", - "autoload": { - "psr-4": { - "Cron\\": "src/Cron/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Michael Dowling", - "email": "mtdowling@gmail.com", - "homepage": "https://github.com/mtdowling" - } - ], - "description": "CRON for PHP: Calculate the next or previous run date and determine if a CRON expression is due", - "keywords": [ - "cron", - "schedule" - ], - "time": "2017-01-23T04:29:33+00:00" + "time": "2018-11-05T09:00:11+00:00" }, { "name": "nesbot/carbon", - "version": "1.34.0", + "version": "1.25.0", "source": { "type": "git", "url": "https://github.com/briannesbitt/Carbon.git", - "reference": "1dbd3cb01c5645f3e7deda7aa46ef780d95fcc33" + "reference": "cbcf13da0b531767e39eb86e9687f5deba9857b4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/1dbd3cb01c5645f3e7deda7aa46ef780d95fcc33", - "reference": "1dbd3cb01c5645f3e7deda7aa46ef780d95fcc33", + "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/cbcf13da0b531767e39eb86e9687f5deba9857b4", + "reference": "cbcf13da0b531767e39eb86e9687f5deba9857b4", "shasum": "" }, "require": { @@ -2070,15 +2480,13 @@ }, "type": "library", "extra": { - "laravel": { - "providers": [ - "Carbon\\Laravel\\ServiceProvider" - ] + "branch-alias": { + "dev-master": "1.23-dev" } }, "autoload": { "psr-4": { - "": "src/" + "Carbon\\": "src/Carbon/" } }, "notification-url": "https://packagist.org/downloads/", @@ -2099,28 +2507,28 @@ "datetime", "time" ], - "time": "2018-09-20T19:36:25+00:00" + "time": "2018-03-19T15:50:49+00:00" }, { "name": "nikic/php-parser", - "version": "3.x-dev", + "version": "v4.1.0", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "bb87e28e7d7b8d9a7fda231d37457c9210faf6ce" + "reference": "d0230c5c77a7e3cfa69446febf340978540958c0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/bb87e28e7d7b8d9a7fda231d37457c9210faf6ce", - "reference": "bb87e28e7d7b8d9a7fda231d37457c9210faf6ce", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/d0230c5c77a7e3cfa69446febf340978540958c0", + "reference": "d0230c5c77a7e3cfa69446febf340978540958c0", "shasum": "" }, "require": { "ext-tokenizer": "*", - "php": ">=5.5" + "php": ">=7.0" }, "require-dev": { - "phpunit/phpunit": "~4.0|~5.0" + "phpunit/phpunit": "^6.5 || ^7.0" }, "bin": [ "bin/php-parse" @@ -2128,7 +2536,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-master": "4.1-dev" } }, "autoload": { @@ -2150,37 +2558,33 @@ "parser", "php" ], - "time": "2018-02-28T20:30:58+00:00" + "time": "2018-10-10T09:24:14+00:00" }, { "name": "paragonie/random_compat", - "version": "v2.0.17", + "version": "v9.99.99", "source": { "type": "git", "url": "https://github.com/paragonie/random_compat.git", - "reference": "29af24f25bab834fcbb38ad2a69fa93b867e070d" + "reference": "84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/paragonie/random_compat/zipball/29af24f25bab834fcbb38ad2a69fa93b867e070d", - "reference": "29af24f25bab834fcbb38ad2a69fa93b867e070d", + "url": "https://api.github.com/repos/paragonie/random_compat/zipball/84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95", + "reference": "84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95", "shasum": "" }, "require": { - "php": ">=5.2.0" + "php": "^7" }, "require-dev": { - "phpunit/phpunit": "4.*|5.*" + "phpunit/phpunit": "4.*|5.*", + "vimeo/psalm": "^1" }, "suggest": { "ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes." }, "type": "library", - "autoload": { - "files": [ - "lib/random.php" - ] - }, "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" @@ -2199,20 +2603,84 @@ "pseudorandom", "random" ], - "time": "2018-07-04T16:31:37+00:00" + "time": "2018-07-02T15:55:56+00:00" }, { - "name": "phpseclib/phpseclib", - "version": "2.0.x-dev", + "name": "php-opencloud/openstack", + "version": "v3.0.5", "source": { "type": "git", - "url": "https://github.com/phpseclib/phpseclib.git", - "reference": "59bd7acf89ae1b12e95c3b033af7a9f4f26019dd" + "url": "https://github.com/php-opencloud/openstack.git", + "reference": "2883c92cdfe05d4a11533497c2b74cc018c7cf0b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/59bd7acf89ae1b12e95c3b033af7a9f4f26019dd", - "reference": "59bd7acf89ae1b12e95c3b033af7a9f4f26019dd", + "url": "https://api.github.com/repos/php-opencloud/openstack/zipball/2883c92cdfe05d4a11533497c2b74cc018c7cf0b", + "reference": "2883c92cdfe05d4a11533497c2b74cc018c7cf0b", + "shasum": "" + }, + "require": { + "guzzlehttp/guzzle": "~6.1", + "justinrainbow/json-schema": "~5.2", + "php": "~7.0" + }, + "require-dev": { + "friendsofphp/php-cs-fixer": "^2.9", + "jakub-onderka/php-parallel-lint": "^1.0", + "phpunit/phpunit": "^6.5", + "psr/log": "^1.0", + "sami/sami": "dev-master", + "satooshi/php-coveralls": "^2.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0-dev" + } + }, + "autoload": { + "psr-4": { + "OpenStack\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "Apache-2.0" + ], + "authors": [ + { + "name": "Jamie Hannaford", + "email": "jamie.hannaford@rackspace.com", + "homepage": "https://github.com/jamiehannaford" + }, + { + "name": "Ha Phan", + "email": "thanhha.work@gmail.com", + "homepage": "https://github.com/haphan" + } + ], + "description": "PHP SDK for OpenStack APIs. Supports BlockStorage, Compute, Identity, Images, Networking and Metric Gnocchi", + "homepage": "https://github.com/php-opencloud/openstack", + "keywords": [ + "Openstack", + "api", + "php", + "sdk" + ], + "time": "2018-03-13T10:03:02+00:00" + }, + { + "name": "phpseclib/phpseclib", + "version": "2.0.12", + "source": { + "type": "git", + "url": "https://github.com/phpseclib/phpseclib.git", + "reference": "8814dc7841db159daed0b32c2b08fb7e03c6afe7" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/8814dc7841db159daed0b32c2b08fb7e03c6afe7", + "reference": "8814dc7841db159daed0b32c2b08fb7e03c6afe7", "shasum": "" }, "require": { @@ -2291,27 +2759,27 @@ "x.509", "x509" ], - "time": "2018-10-27T22:43:31+00:00" + "time": "2018-11-04T05:45:48+00:00" }, { "name": "predis/predis", - "version": "v1.0.1", + "version": "v1.0.4", "source": { "type": "git", "url": "https://github.com/nrk/predis.git", - "reference": "7a170b3d8123c556597b4fbdb88631f99de180c2" + "reference": "9ead747663bb1b1ae017dfa0d152aca87792b42f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nrk/predis/zipball/7a170b3d8123c556597b4fbdb88631f99de180c2", - "reference": "7a170b3d8123c556597b4fbdb88631f99de180c2", + "url": "https://api.github.com/repos/nrk/predis/zipball/9ead747663bb1b1ae017dfa0d152aca87792b42f", + "reference": "9ead747663bb1b1ae017dfa0d152aca87792b42f", "shasum": "" }, "require": { "php": ">=5.3.2" }, "require-dev": { - "phpunit/phpunit": "~4.0" + "phpunit/phpunit": "~4.8" }, "suggest": { "ext-curl": "Allows access to Webdis when paired with phpiredis", @@ -2334,27 +2802,27 @@ "homepage": "http://clorophilla.net" } ], - "description": "Flexible and feature-complete PHP client library for Redis", + "description": "Flexible and feature-complete Redis client for PHP and HHVM", "homepage": "http://github.com/nrk/predis", "keywords": [ "nosql", "predis", "redis" ], - "time": "2015-01-02T12:51:34+00:00" + "time": "2016-05-30T15:25:52+00:00" }, { "name": "psr/cache", - "version": "dev-master", + "version": "1.0.1", "source": { "type": "git", "url": "https://github.com/php-fig/cache.git", - "reference": "78c5a01ddbf11cf731f1338a4f5aba23b14d5b47" + "reference": "d11b50ad223250cf17b86e38383413f5a6764bf8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/cache/zipball/78c5a01ddbf11cf731f1338a4f5aba23b14d5b47", - "reference": "78c5a01ddbf11cf731f1338a4f5aba23b14d5b47", + "url": "https://api.github.com/repos/php-fig/cache/zipball/d11b50ad223250cf17b86e38383413f5a6764bf8", + "reference": "d11b50ad223250cf17b86e38383413f5a6764bf8", "shasum": "" }, "require": { @@ -2387,11 +2855,60 @@ "psr", "psr-6" ], - "time": "2016-10-13T14:48:10+00:00" + "time": "2016-08-06T20:24:11+00:00" + }, + { + "name": "psr/container", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/php-fig/container.git", + "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/container/zipball/b7ce3b176482dbbc1245ebf52b181af44c2cf55f", + "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\Container\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" + } + ], + "description": "Common Container Interface (PHP FIG PSR-11)", + "homepage": "https://github.com/php-fig/container", + "keywords": [ + "PSR-11", + "container", + "container-interface", + "container-interop", + "psr" + ], + "time": "2017-02-14T16:28:37+00:00" }, { "name": "psr/http-message", - "version": "dev-master", + "version": "1.0.1", "source": { "type": "git", "url": "https://github.com/php-fig/http-message.git", @@ -2441,16 +2958,16 @@ }, { "name": "psr/log", - "version": "dev-master", + "version": "1.1.0", "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "3490ba5925e6dcbe6de950c5c6b8dce9f6e96eda" + "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/3490ba5925e6dcbe6de950c5c6b8dce9f6e96eda", - "reference": "3490ba5925e6dcbe6de950c5c6b8dce9f6e96eda", + "url": "https://api.github.com/repos/php-fig/log/zipball/6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd", + "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd", "shasum": "" }, "require": { @@ -2484,34 +3001,84 @@ "psr", "psr-3" ], - "time": "2018-04-03T15:59:15+00:00" + "time": "2018-11-20T15:27:04+00:00" }, { - "name": "psy/psysh", - "version": "v0.8.18", + "name": "psr/simple-cache", + "version": "1.0.1", "source": { "type": "git", - "url": "https://github.com/bobthecow/psysh.git", - "reference": "5357b1cffc8fb375d6a9e3c86d5c82dd38a40834" + "url": "https://github.com/php-fig/simple-cache.git", + "reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bobthecow/psysh/zipball/5357b1cffc8fb375d6a9e3c86d5c82dd38a40834", - "reference": "5357b1cffc8fb375d6a9e3c86d5c82dd38a40834", + "url": "https://api.github.com/repos/php-fig/simple-cache/zipball/408d5eafb83c57f6365a3ca330ff23aa4a5fa39b", + "reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\SimpleCache\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" + } + ], + "description": "Common interfaces for simple caching", + "keywords": [ + "cache", + "caching", + "psr", + "psr-16", + "simple-cache" + ], + "time": "2017-10-23T01:57:42+00:00" + }, + { + "name": "psy/psysh", + "version": "v0.9.9", + "source": { + "type": "git", + "url": "https://github.com/bobthecow/psysh.git", + "reference": "9aaf29575bb8293206bb0420c1e1c87ff2ffa94e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/bobthecow/psysh/zipball/9aaf29575bb8293206bb0420c1e1c87ff2ffa94e", + "reference": "9aaf29575bb8293206bb0420c1e1c87ff2ffa94e", "shasum": "" }, "require": { "dnoegel/php-xdg-base-dir": "0.1", - "jakub-onderka/php-console-highlighter": "0.3.*", - "nikic/php-parser": "~1.3|~2.0|~3.0", - "php": ">=5.3.9", + "ext-json": "*", + "ext-tokenizer": "*", + "jakub-onderka/php-console-highlighter": "0.3.*|0.4.*", + "nikic/php-parser": "~1.3|~2.0|~3.0|~4.0", + "php": ">=5.4.0", "symfony/console": "~2.3.10|^2.4.2|~3.0|~4.0", "symfony/var-dumper": "~2.7|~3.0|~4.0" }, "require-dev": { - "hoa/console": "~3.16|~1.14", - "phpunit/phpunit": "^4.8.35|^5.4.3", - "symfony/finder": "~2.1|~3.0|~4.0" + "bamarni/composer-bin-plugin": "^1.2", + "hoa/console": "~2.15|~3.16", + "phpunit/phpunit": "~4.8.35|~5.0|~6.0|~7.0" }, "suggest": { "ext-pcntl": "Enabling the PCNTL extension makes PsySH a lot happier :)", @@ -2526,15 +3093,15 @@ "type": "library", "extra": { "branch-alias": { - "dev-develop": "0.8.x-dev" + "dev-develop": "0.9.x-dev" } }, "autoload": { "files": [ - "src/Psy/functions.php" + "src/functions.php" ], "psr-4": { - "Psy\\": "src/Psy/" + "Psy\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -2556,64 +3123,23 @@ "interactive", "shell" ], - "time": "2018-04-02T05:41:44+00:00" - }, - { - "name": "ralouphie/getallheaders", - "version": "2.0.5", - "source": { - "type": "git", - "url": "https://github.com/ralouphie/getallheaders.git", - "reference": "5601c8a83fbba7ef674a7369456d12f1e0d0eafa" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/ralouphie/getallheaders/zipball/5601c8a83fbba7ef674a7369456d12f1e0d0eafa", - "reference": "5601c8a83fbba7ef674a7369456d12f1e0d0eafa", - "shasum": "" - }, - "require": { - "php": ">=5.3" - }, - "require-dev": { - "phpunit/phpunit": "~3.7.0", - "satooshi/php-coveralls": ">=1.0" - }, - "type": "library", - "autoload": { - "files": [ - "src/getallheaders.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Ralph Khattar", - "email": "ralph.khattar@gmail.com" - } - ], - "description": "A polyfill for getallheaders.", - "time": "2016-02-11T07:05:27+00:00" + "time": "2018-10-13T15:16:03+00:00" }, { "name": "ramsey/uuid", - "version": "3.x-dev", + "version": "3.8.0", "source": { "type": "git", "url": "https://github.com/ramsey/uuid.git", - "reference": "4c467ce4d5a72c3cf0832c813d4d84d222c3d4bb" + "reference": "d09ea80159c1929d75b3f9c60504d613aeb4a1e3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ramsey/uuid/zipball/4c467ce4d5a72c3cf0832c813d4d84d222c3d4bb", - "reference": "4c467ce4d5a72c3cf0832c813d4d84d222c3d4bb", + "url": "https://api.github.com/repos/ramsey/uuid/zipball/d09ea80159c1929d75b3f9c60504d613aeb4a1e3", + "reference": "d09ea80159c1929d75b3f9c60504d613aeb4a1e3", "shasum": "" }, "require": { - "ext-json": "*", "paragonie/random_compat": "^1.0|^2.0|9.99.99", "php": "^5.4 || ^7.0", "symfony/polyfill-ctype": "^1.8" @@ -2679,7 +3205,7 @@ "identifier", "uuid" ], - "time": "2018-08-12T15:49:01+00:00" + "time": "2018-07-19T23:38:55+00:00" }, { "name": "sabre/uri", @@ -2894,29 +3420,34 @@ }, { "name": "swiftmailer/swiftmailer", - "version": "5.x-dev", + "version": "v6.1.3", "source": { "type": "git", "url": "https://github.com/swiftmailer/swiftmailer.git", - "reference": "181b89f18a90f8925ef805f950d47a7190e9b950" + "reference": "8ddcb66ac10c392d3beb54829eef8ac1438595f4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/181b89f18a90f8925ef805f950d47a7190e9b950", - "reference": "181b89f18a90f8925ef805f950d47a7190e9b950", + "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/8ddcb66ac10c392d3beb54829eef8ac1438595f4", + "reference": "8ddcb66ac10c392d3beb54829eef8ac1438595f4", "shasum": "" }, "require": { - "php": ">=5.3.3" + "egulias/email-validator": "~2.0", + "php": ">=7.0.0" }, "require-dev": { "mockery/mockery": "~0.9.1", - "symfony/phpunit-bridge": "~3.2" + "symfony/phpunit-bridge": "~3.3@dev" + }, + "suggest": { + "ext-intl": "Needed to support internationalized email addresses", + "true/punycode": "Needed to support internationalized email addresses, if ext-intl is not installed" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "5.4-dev" + "dev-master": "6.1-dev" } }, "autoload": { @@ -2944,41 +3475,48 @@ "mail", "mailer" ], - "time": "2018-07-31T09:26:32+00:00" + "time": "2018-09-11T07:12:52+00:00" }, { "name": "symfony/console", - "version": "3.1.x-dev", + "version": "v4.1.7", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "047f16485d68c083bd5d9b73ff16f9cb9c1a9f52" + "reference": "432122af37d8cd52fba1b294b11976e0d20df595" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/047f16485d68c083bd5d9b73ff16f9cb9c1a9f52", - "reference": "047f16485d68c083bd5d9b73ff16f9cb9c1a9f52", + "url": "https://api.github.com/repos/symfony/console/zipball/432122af37d8cd52fba1b294b11976e0d20df595", + "reference": "432122af37d8cd52fba1b294b11976e0d20df595", "shasum": "" }, "require": { - "php": ">=5.5.9", - "symfony/debug": "~2.8|~3.0", + "php": "^7.1.3", "symfony/polyfill-mbstring": "~1.0" }, + "conflict": { + "symfony/dependency-injection": "<3.4", + "symfony/process": "<3.3" + }, "require-dev": { "psr/log": "~1.0", - "symfony/event-dispatcher": "~2.8|~3.0", - "symfony/process": "~2.8|~3.0" + "symfony/config": "~3.4|~4.0", + "symfony/dependency-injection": "~3.4|~4.0", + "symfony/event-dispatcher": "~3.4|~4.0", + "symfony/lock": "~3.4|~4.0", + "symfony/process": "~3.4|~4.0" }, "suggest": { - "psr/log": "For using the console logger", + "psr/log-implementation": "For using the console logger", "symfony/event-dispatcher": "", + "symfony/lock": "", "symfony/process": "" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.1-dev" + "dev-master": "4.1-dev" } }, "autoload": { @@ -3005,37 +3543,89 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2017-01-08T20:43:43+00:00" + "time": "2018-10-31T09:30:44+00:00" }, { - "name": "symfony/debug", - "version": "3.1.x-dev", + "name": "symfony/css-selector", + "version": "v4.1.7", "source": { "type": "git", - "url": "https://github.com/symfony/debug.git", - "reference": "c6661361626b3cf5cf2089df98b3b5006a197e85" + "url": "https://github.com/symfony/css-selector.git", + "reference": "d67de79a70a27d93c92c47f37ece958bf8de4d8a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/c6661361626b3cf5cf2089df98b3b5006a197e85", - "reference": "c6661361626b3cf5cf2089df98b3b5006a197e85", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/d67de79a70a27d93c92c47f37ece958bf8de4d8a", + "reference": "d67de79a70a27d93c92c47f37ece958bf8de4d8a", "shasum": "" }, "require": { - "php": ">=5.5.9", - "psr/log": "~1.0" - }, - "conflict": { - "symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2" - }, - "require-dev": { - "symfony/class-loader": "~2.8|~3.0", - "symfony/http-kernel": "~2.8|~3.0" + "php": "^7.1.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.1-dev" + "dev-master": "4.1-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\CssSelector\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jean-François Simon", + "email": "jeanfrancois.simon@sensiolabs.com" + }, + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony CssSelector Component", + "homepage": "https://symfony.com", + "time": "2018-10-02T16:36:10+00:00" + }, + { + "name": "symfony/debug", + "version": "v4.1.7", + "source": { + "type": "git", + "url": "https://github.com/symfony/debug.git", + "reference": "19090917b848a799cbae4800abf740fe4eb71c1d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/debug/zipball/19090917b848a799cbae4800abf740fe4eb71c1d", + "reference": "19090917b848a799cbae4800abf740fe4eb71c1d", + "shasum": "" + }, + "require": { + "php": "^7.1.3", + "psr/log": "~1.0" + }, + "conflict": { + "symfony/http-kernel": "<3.4" + }, + "require-dev": { + "symfony/http-kernel": "~3.4|~4.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.1-dev" } }, "autoload": { @@ -3062,34 +3652,34 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "time": "2017-01-28T00:04:57+00:00" + "time": "2018-10-31T09:09:42+00:00" }, { "name": "symfony/event-dispatcher", - "version": "3.4.x-dev", + "version": "v4.1.7", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "db9e829c8f34c3d35cf37fcd4cdb4293bc4a2f14" + "reference": "552541dad078c85d9414b09c041ede488b456cd5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/db9e829c8f34c3d35cf37fcd4cdb4293bc4a2f14", - "reference": "db9e829c8f34c3d35cf37fcd4cdb4293bc4a2f14", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/552541dad078c85d9414b09c041ede488b456cd5", + "reference": "552541dad078c85d9414b09c041ede488b456cd5", "shasum": "" }, "require": { - "php": "^5.5.9|>=7.0.8" + "php": "^7.1.3" }, "conflict": { - "symfony/dependency-injection": "<3.3" + "symfony/dependency-injection": "<3.4" }, "require-dev": { "psr/log": "~1.0", - "symfony/config": "~2.8|~3.0|~4.0", - "symfony/dependency-injection": "~3.3|~4.0", - "symfony/expression-language": "~2.8|~3.0|~4.0", - "symfony/stopwatch": "~2.8|~3.0|~4.0" + "symfony/config": "~3.4|~4.0", + "symfony/dependency-injection": "~3.4|~4.0", + "symfony/expression-language": "~3.4|~4.0", + "symfony/stopwatch": "~3.4|~4.0" }, "suggest": { "symfony/dependency-injection": "", @@ -3098,7 +3688,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.4-dev" + "dev-master": "4.1-dev" } }, "autoload": { @@ -3125,29 +3715,29 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2018-10-30T16:50:50+00:00" + "time": "2018-10-10T13:52:42+00:00" }, { "name": "symfony/finder", - "version": "3.1.x-dev", + "version": "v4.1.7", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "59687a255d1562f2c17b012418273862083d85f7" + "reference": "1f17195b44543017a9c9b2d437c670627e96ad06" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/59687a255d1562f2c17b012418273862083d85f7", - "reference": "59687a255d1562f2c17b012418273862083d85f7", + "url": "https://api.github.com/repos/symfony/finder/zipball/1f17195b44543017a9c9b2d437c670627e96ad06", + "reference": "1f17195b44543017a9c9b2d437c670627e96ad06", "shasum": "" }, "require": { - "php": ">=5.5.9" + "php": "^7.1.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.1-dev" + "dev-master": "4.1-dev" } }, "autoload": { @@ -3174,33 +3764,34 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", - "time": "2017-01-02T20:31:54+00:00" + "time": "2018-10-03T08:47:56+00:00" }, { "name": "symfony/http-foundation", - "version": "3.1.x-dev", + "version": "v4.1.7", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "cef0ad49a2e90455cfc649522025b5a2929648c0" + "reference": "82d494c1492b0dd24bbc5c2d963fb02eb44491af" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/cef0ad49a2e90455cfc649522025b5a2929648c0", - "reference": "cef0ad49a2e90455cfc649522025b5a2929648c0", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/82d494c1492b0dd24bbc5c2d963fb02eb44491af", + "reference": "82d494c1492b0dd24bbc5c2d963fb02eb44491af", "shasum": "" }, "require": { - "php": ">=5.5.9", + "php": "^7.1.3", "symfony/polyfill-mbstring": "~1.1" }, "require-dev": { - "symfony/expression-language": "~2.8|~3.0" + "predis/predis": "~1.0", + "symfony/expression-language": "~3.4|~4.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.1-dev" + "dev-master": "4.1-dev" } }, "autoload": { @@ -3227,62 +3818,67 @@ ], "description": "Symfony HttpFoundation Component", "homepage": "https://symfony.com", - "time": "2017-01-08T20:43:43+00:00" + "time": "2018-10-31T09:09:42+00:00" }, { "name": "symfony/http-kernel", - "version": "3.1.x-dev", + "version": "v4.1.7", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "c830387dec1b48c100473d10a6a356c3c3ae2a13" + "reference": "958be64ab13b65172ad646ef5ae20364c2305fae" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/c830387dec1b48c100473d10a6a356c3c3ae2a13", - "reference": "c830387dec1b48c100473d10a6a356c3c3ae2a13", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/958be64ab13b65172ad646ef5ae20364c2305fae", + "reference": "958be64ab13b65172ad646ef5ae20364c2305fae", "shasum": "" }, "require": { - "php": ">=5.5.9", + "php": "^7.1.3", "psr/log": "~1.0", - "symfony/debug": "~2.8|~3.0", - "symfony/event-dispatcher": "~2.8|~3.0", - "symfony/http-foundation": "~2.8.13|~3.1.6|~3.2" + "symfony/debug": "~3.4|~4.0", + "symfony/event-dispatcher": "~4.1", + "symfony/http-foundation": "^4.1.1", + "symfony/polyfill-ctype": "~1.8" }, "conflict": { - "symfony/config": "<2.8" + "symfony/config": "<3.4", + "symfony/dependency-injection": "<4.1", + "symfony/var-dumper": "<4.1.1", + "twig/twig": "<1.34|<2.4,>=2" + }, + "provide": { + "psr/log-implementation": "1.0" }, "require-dev": { - "symfony/browser-kit": "~2.8|~3.0", - "symfony/class-loader": "~2.8|~3.0", - "symfony/config": "~2.8|~3.0", - "symfony/console": "~2.8|~3.0", - "symfony/css-selector": "~2.8|~3.0", - "symfony/dependency-injection": "~2.8|~3.0", - "symfony/dom-crawler": "~2.8|~3.0", - "symfony/expression-language": "~2.8|~3.0", - "symfony/finder": "~2.8|~3.0", - "symfony/process": "~2.8|~3.0", - "symfony/routing": "~2.8|~3.0", - "symfony/stopwatch": "~2.8|~3.0", - "symfony/templating": "~2.8|~3.0", - "symfony/translation": "~2.8|~3.0", - "symfony/var-dumper": "~2.8|~3.0" + "psr/cache": "~1.0", + "symfony/browser-kit": "~3.4|~4.0", + "symfony/config": "~3.4|~4.0", + "symfony/console": "~3.4|~4.0", + "symfony/css-selector": "~3.4|~4.0", + "symfony/dependency-injection": "^4.1", + "symfony/dom-crawler": "~3.4|~4.0", + "symfony/expression-language": "~3.4|~4.0", + "symfony/finder": "~3.4|~4.0", + "symfony/process": "~3.4|~4.0", + "symfony/routing": "~3.4|~4.0", + "symfony/stopwatch": "~3.4|~4.0", + "symfony/templating": "~3.4|~4.0", + "symfony/translation": "~3.4|~4.0", + "symfony/var-dumper": "^4.1.1" }, "suggest": { "symfony/browser-kit": "", - "symfony/class-loader": "", "symfony/config": "", "symfony/console": "", "symfony/dependency-injection": "", - "symfony/finder": "", "symfony/var-dumper": "" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.1-dev" + "dev-master": "4.1-dev" } }, "autoload": { @@ -3309,7 +3905,7 @@ ], "description": "Symfony HttpKernel Component", "homepage": "https://symfony.com", - "time": "2017-01-28T02:53:17+00:00" + "time": "2018-11-03T11:11:23+00:00" }, { "name": "symfony/polyfill-ctype", @@ -3429,21 +4025,20 @@ "time": "2018-09-21T13:07:52+00:00" }, { - "name": "symfony/polyfill-php55", + "name": "symfony/polyfill-php72", "version": "v1.10.0", "source": { "type": "git", - "url": "https://github.com/symfony/polyfill-php55.git", - "reference": "42a4c00a347625ac8853c3358c47eeadc7fd4e96" + "url": "https://github.com/symfony/polyfill-php72.git", + "reference": "9050816e2ca34a8e916c3a0ae8b9c2fccf68b631" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php55/zipball/42a4c00a347625ac8853c3358c47eeadc7fd4e96", - "reference": "42a4c00a347625ac8853c3358c47eeadc7fd4e96", + "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/9050816e2ca34a8e916c3a0ae8b9c2fccf68b631", + "reference": "9050816e2ca34a8e916c3a0ae8b9c2fccf68b631", "shasum": "" }, "require": { - "ircmaxell/password-compat": "~1.0", "php": ">=5.3.3" }, "type": "library", @@ -3454,7 +4049,7 @@ }, "autoload": { "psr-4": { - "Symfony\\Polyfill\\Php55\\": "" + "Symfony\\Polyfill\\Php72\\": "" }, "files": [ "bootstrap.php" @@ -3474,7 +4069,7 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony polyfill backporting some PHP 5.5+ features to lower PHP versions", + "description": "Symfony polyfill backporting some PHP 7.2+ features to lower PHP versions", "homepage": "https://symfony.com", "keywords": [ "compatibility", @@ -3482,137 +4077,29 @@ "portable", "shim" ], - "time": "2018-10-31T12:13:01+00:00" - }, - { - "name": "symfony/polyfill-php56", - "version": "v1.10.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-php56.git", - "reference": "ff208829fe1aa48ab9af356992bb7199fed551af" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/ff208829fe1aa48ab9af356992bb7199fed551af", - "reference": "ff208829fe1aa48ab9af356992bb7199fed551af", - "shasum": "" - }, - "require": { - "php": ">=5.3.3", - "symfony/polyfill-util": "~1.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.9-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Php56\\": "" - }, - "files": [ - "bootstrap.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony polyfill backporting some PHP 5.6+ features to lower PHP versions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "polyfill", - "portable", - "shim" - ], - "time": "2018-09-21T06:26:08+00:00" - }, - { - "name": "symfony/polyfill-util", - "version": "v1.10.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-util.git", - "reference": "3b58903eae668d348a7126f999b0da0f2f93611c" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/3b58903eae668d348a7126f999b0da0f2f93611c", - "reference": "3b58903eae668d348a7126f999b0da0f2f93611c", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.9-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Util\\": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony utilities for portability of PHP codes", - "homepage": "https://symfony.com", - "keywords": [ - "compat", - "compatibility", - "polyfill", - "shim" - ], - "time": "2018-09-30T16:36:12+00:00" + "time": "2018-09-21T13:07:52+00:00" }, { "name": "symfony/process", - "version": "3.1.x-dev", + "version": "v4.1.7", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "2605753c5f8c531623d24d002825ebb1d6a22248" + "reference": "3e83acef94d979b1de946599ef86b3a352abcdc9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/2605753c5f8c531623d24d002825ebb1d6a22248", - "reference": "2605753c5f8c531623d24d002825ebb1d6a22248", + "url": "https://api.github.com/repos/symfony/process/zipball/3e83acef94d979b1de946599ef86b3a352abcdc9", + "reference": "3e83acef94d979b1de946599ef86b3a352abcdc9", "shasum": "" }, "require": { - "php": ">=5.5.9" + "php": "^7.1.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.1-dev" + "dev-master": "4.1-dev" } }, "autoload": { @@ -3639,36 +4126,38 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "time": "2017-01-21T17:13:55+00:00" + "time": "2018-10-14T20:48:13+00:00" }, { "name": "symfony/routing", - "version": "3.1.x-dev", + "version": "v4.1.7", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "f25581d4eb0a82962c291917f826166f0dcd8a9a" + "reference": "d4a3c14cfbe6b9c05a1d6e948654022d4d1ad3fd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/f25581d4eb0a82962c291917f826166f0dcd8a9a", - "reference": "f25581d4eb0a82962c291917f826166f0dcd8a9a", + "url": "https://api.github.com/repos/symfony/routing/zipball/d4a3c14cfbe6b9c05a1d6e948654022d4d1ad3fd", + "reference": "d4a3c14cfbe6b9c05a1d6e948654022d4d1ad3fd", "shasum": "" }, "require": { - "php": ">=5.5.9" + "php": "^7.1.3" }, "conflict": { - "symfony/config": "<2.8" + "symfony/config": "<3.4", + "symfony/dependency-injection": "<3.4", + "symfony/yaml": "<3.4" }, "require-dev": { "doctrine/annotations": "~1.0", - "doctrine/common": "~2.2", "psr/log": "~1.0", - "symfony/config": "~2.8|~3.0", - "symfony/expression-language": "~2.8|~3.0", - "symfony/http-foundation": "~2.8|~3.0", - "symfony/yaml": "~2.8|~3.0" + "symfony/config": "~3.4|~4.0", + "symfony/dependency-injection": "~3.4|~4.0", + "symfony/expression-language": "~3.4|~4.0", + "symfony/http-foundation": "~3.4|~4.0", + "symfony/yaml": "~3.4|~4.0" }, "suggest": { "doctrine/annotations": "For using the annotation loader", @@ -3681,7 +4170,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.1-dev" + "dev-master": "4.1-dev" } }, "autoload": { @@ -3714,45 +4203,60 @@ "uri", "url" ], - "time": "2017-01-28T00:04:57+00:00" + "time": "2018-10-28T18:38:52+00:00" }, { "name": "symfony/serializer", - "version": "2.8.x-dev", + "version": "v4.1.7", "source": { "type": "git", "url": "https://github.com/symfony/serializer.git", - "reference": "b72447abdab3050a46fbedfa11e66e7c515e797d" + "reference": "93a1967333cdd4f66c4a00f30895d124326f145b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/serializer/zipball/b72447abdab3050a46fbedfa11e66e7c515e797d", - "reference": "b72447abdab3050a46fbedfa11e66e7c515e797d", + "url": "https://api.github.com/repos/symfony/serializer/zipball/93a1967333cdd4f66c4a00f30895d124326f145b", + "reference": "93a1967333cdd4f66c4a00f30895d124326f145b", "shasum": "" }, "require": { - "php": ">=5.3.9", - "symfony/polyfill-ctype": "~1.8", - "symfony/polyfill-php55": "~1.0" + "php": "^7.1.3", + "symfony/polyfill-ctype": "~1.8" + }, + "conflict": { + "phpdocumentor/type-resolver": "<0.2.1", + "symfony/dependency-injection": "<3.4", + "symfony/property-access": "<3.4", + "symfony/property-info": "<3.4", + "symfony/yaml": "<3.4" }, "require-dev": { "doctrine/annotations": "~1.0", "doctrine/cache": "~1.0", - "symfony/config": "~2.2|~3.0.0", - "symfony/property-access": "~2.3|~3.0.0", - "symfony/yaml": "^2.0.5|~3.0.0" + "phpdocumentor/reflection-docblock": "^3.0|^4.0", + "symfony/cache": "~3.4|~4.0", + "symfony/config": "~3.4|~4.0", + "symfony/dependency-injection": "~3.4|~4.0", + "symfony/http-foundation": "~3.4|~4.0", + "symfony/property-access": "~3.4|~4.0", + "symfony/property-info": "~3.4|~4.0", + "symfony/validator": "~3.4|~4.0", + "symfony/yaml": "~3.4|~4.0" }, "suggest": { "doctrine/annotations": "For using the annotation mapping. You will also need doctrine/cache.", "doctrine/cache": "For using the default cached annotation reader and metadata cache.", + "psr/cache-implementation": "For using the metadata cache.", "symfony/config": "For using the XML mapping loader.", + "symfony/http-foundation": "To use the DataUriNormalizer.", "symfony/property-access": "For using the ObjectNormalizer.", + "symfony/property-info": "To deserialize relations.", "symfony/yaml": "For using the default YAML mapping loader." }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.8-dev" + "dev-master": "4.1-dev" } }, "autoload": { @@ -3779,44 +4283,49 @@ ], "description": "Symfony Serializer Component", "homepage": "https://symfony.com", - "time": "2018-10-02T03:12:00+00:00" + "time": "2018-10-28T18:38:52+00:00" }, { "name": "symfony/translation", - "version": "3.1.x-dev", + "version": "v4.1.7", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "d5a20fab5f63f44c233c69b3041c3cb1d4945e45" + "reference": "aa04dc1c75b7d3da7bd7003104cd0cfc5dff635c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/d5a20fab5f63f44c233c69b3041c3cb1d4945e45", - "reference": "d5a20fab5f63f44c233c69b3041c3cb1d4945e45", + "url": "https://api.github.com/repos/symfony/translation/zipball/aa04dc1c75b7d3da7bd7003104cd0cfc5dff635c", + "reference": "aa04dc1c75b7d3da7bd7003104cd0cfc5dff635c", "shasum": "" }, "require": { - "php": ">=5.5.9", + "php": "^7.1.3", "symfony/polyfill-mbstring": "~1.0" }, "conflict": { - "symfony/config": "<2.8" + "symfony/config": "<3.4", + "symfony/dependency-injection": "<3.4", + "symfony/yaml": "<3.4" }, "require-dev": { "psr/log": "~1.0", - "symfony/config": "~2.8|~3.0", - "symfony/intl": "~2.8|~3.0", - "symfony/yaml": "~2.8|~3.0" + "symfony/config": "~3.4|~4.0", + "symfony/console": "~3.4|~4.0", + "symfony/dependency-injection": "~3.4|~4.0", + "symfony/finder": "~2.8|~3.0|~4.0", + "symfony/intl": "~3.4|~4.0", + "symfony/yaml": "~3.4|~4.0" }, "suggest": { - "psr/log": "To use logging capability in translator", + "psr/log-implementation": "To use logging capability in translator", "symfony/config": "", "symfony/yaml": "" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.1-dev" + "dev-master": "4.1-dev" } }, "autoload": { @@ -3843,36 +4352,48 @@ ], "description": "Symfony Translation Component", "homepage": "https://symfony.com", - "time": "2017-01-21T17:01:39+00:00" + "time": "2018-10-28T18:38:52+00:00" }, { "name": "symfony/var-dumper", - "version": "3.1.x-dev", + "version": "v4.1.7", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "16df11647e5b992d687cb4eeeb9a882d5f5c26b9" + "reference": "60319b45653580b0cdacca499344577d87732f16" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/16df11647e5b992d687cb4eeeb9a882d5f5c26b9", - "reference": "16df11647e5b992d687cb4eeeb9a882d5f5c26b9", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/60319b45653580b0cdacca499344577d87732f16", + "reference": "60319b45653580b0cdacca499344577d87732f16", "shasum": "" }, "require": { - "php": ">=5.5.9", - "symfony/polyfill-mbstring": "~1.0" + "php": "^7.1.3", + "symfony/polyfill-mbstring": "~1.0", + "symfony/polyfill-php72": "~1.5" + }, + "conflict": { + "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0", + "symfony/console": "<3.4" }, "require-dev": { - "twig/twig": "~1.20|~2.0" + "ext-iconv": "*", + "symfony/process": "~3.4|~4.0", + "twig/twig": "~1.34|~2.4" }, "suggest": { - "ext-symfony_debug": "" + "ext-iconv": "To convert non-UTF-8 strings to UTF-8 (or symfony/polyfill-iconv in case ext-iconv cannot be used).", + "ext-intl": "To show region name in time zone dump", + "symfony/console": "To use the ServerDumpCommand and/or the bin/var-dump-server script" }, + "bin": [ + "Resources/bin/var-dump-server" + ], "type": "library", "extra": { "branch-alias": { - "dev-master": "3.1-dev" + "dev-master": "4.1-dev" } }, "autoload": { @@ -3906,20 +4427,67 @@ "debug", "dump" ], - "time": "2017-01-24T13:02:38+00:00" + "time": "2018-10-02T16:36:10+00:00" }, { - "name": "vlucas/phpdotenv", - "version": "dev-master", + "name": "tijsverkoyen/css-to-inline-styles", + "version": "2.2.1", "source": { "type": "git", - "url": "https://github.com/vlucas/phpdotenv.git", - "reference": "cfd5dc225767ca154853752abc93aeec040fcf36" + "url": "https://github.com/tijsverkoyen/CssToInlineStyles.git", + "reference": "0ed4a2ea4e0902dac0489e6436ebcd5bbcae9757" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/cfd5dc225767ca154853752abc93aeec040fcf36", - "reference": "cfd5dc225767ca154853752abc93aeec040fcf36", + "url": "https://api.github.com/repos/tijsverkoyen/CssToInlineStyles/zipball/0ed4a2ea4e0902dac0489e6436ebcd5bbcae9757", + "reference": "0ed4a2ea4e0902dac0489e6436ebcd5bbcae9757", + "shasum": "" + }, + "require": { + "php": "^5.5 || ^7.0", + "symfony/css-selector": "^2.7 || ^3.0 || ^4.0" + }, + "require-dev": { + "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.2.x-dev" + } + }, + "autoload": { + "psr-4": { + "TijsVerkoyen\\CssToInlineStyles\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Tijs Verkoyen", + "email": "css_to_inline_styles@verkoyen.eu", + "role": "Developer" + } + ], + "description": "CssToInlineStyles is a class that enables you to convert HTML-pages/files into HTML-pages/files with inline styles. This is very useful when you're sending emails.", + "homepage": "https://github.com/tijsverkoyen/CssToInlineStyles", + "time": "2017-11-27T11:13:29+00:00" + }, + { + "name": "vlucas/phpdotenv", + "version": "v2.5.1", + "source": { + "type": "git", + "url": "https://github.com/vlucas/phpdotenv.git", + "reference": "8abb4f9aa89ddea9d52112c65bbe8d0125e2fa8e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/8abb4f9aa89ddea9d52112c65bbe8d0125e2fa8e", + "reference": "8abb4f9aa89ddea9d52112c65bbe8d0125e2fa8e", "shasum": "" }, "require": { @@ -3956,22 +4524,83 @@ "env", "environment" ], - "time": "2018-10-30T17:29:25+00:00" + "time": "2018-07-29T20:33:41+00:00" } ], "packages-dev": [ { - "name": "fzaninotto/faker", - "version": "dev-master", + "name": "filp/whoops", + "version": "2.3.1", "source": { "type": "git", - "url": "https://github.com/fzaninotto/Faker.git", - "reference": "82daf83b19d934291d4c2f2a22a4b3e0aacc68dd" + "url": "https://github.com/filp/whoops.git", + "reference": "bc0fd11bc455cc20ee4b5edabc63ebbf859324c7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/82daf83b19d934291d4c2f2a22a4b3e0aacc68dd", - "reference": "82daf83b19d934291d4c2f2a22a4b3e0aacc68dd", + "url": "https://api.github.com/repos/filp/whoops/zipball/bc0fd11bc455cc20ee4b5edabc63ebbf859324c7", + "reference": "bc0fd11bc455cc20ee4b5edabc63ebbf859324c7", + "shasum": "" + }, + "require": { + "php": "^5.5.9 || ^7.0", + "psr/log": "^1.0.1" + }, + "require-dev": { + "mockery/mockery": "^0.9 || ^1.0", + "phpunit/phpunit": "^4.8.35 || ^5.7", + "symfony/var-dumper": "^2.6 || ^3.0 || ^4.0" + }, + "suggest": { + "symfony/var-dumper": "Pretty print complex values better with var-dumper available", + "whoops/soap": "Formats errors as SOAP responses" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.2-dev" + } + }, + "autoload": { + "psr-4": { + "Whoops\\": "src/Whoops/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Filipe Dobreira", + "homepage": "https://github.com/filp", + "role": "Developer" + } + ], + "description": "php error handling for cool kids", + "homepage": "https://filp.github.io/whoops/", + "keywords": [ + "error", + "exception", + "handling", + "library", + "throwable", + "whoops" + ], + "time": "2018-10-23T09:00:00+00:00" + }, + { + "name": "fzaninotto/faker", + "version": "v1.8.0", + "source": { + "type": "git", + "url": "https://github.com/fzaninotto/Faker.git", + "reference": "f72816b43e74063c8b10357394b6bba8cb1c10de" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/f72816b43e74063c8b10357394b6bba8cb1c10de", + "reference": "f72816b43e74063c8b10357394b6bba8cb1c10de", "shasum": "" }, "require": { @@ -3985,7 +4614,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.9-dev" + "dev-master": "1.8-dev" } }, "autoload": { @@ -4008,20 +4637,20 @@ "faker", "fixtures" ], - "time": "2018-09-26T15:12:10+00:00" + "time": "2018-07-12T10:23:15+00:00" }, { "name": "hamcrest/hamcrest-php", - "version": "1.2.x-dev", + "version": "v2.0.0", "source": { "type": "git", "url": "https://github.com/hamcrest/hamcrest-php.git", - "reference": "26968e9810ff0d1aa48f6d67a862559d92a51884" + "reference": "776503d3a8e85d4f9a1148614f95b7a608b046ad" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/hamcrest/hamcrest-php/zipball/26968e9810ff0d1aa48f6d67a862559d92a51884", - "reference": "26968e9810ff0d1aa48f6d67a862559d92a51884", + "url": "https://api.github.com/repos/hamcrest/hamcrest-php/zipball/776503d3a8e85d4f9a1148614f95b7a608b046ad", + "reference": "776503d3a8e85d4f9a1148614f95b7a608b046ad", "shasum": "" }, "require": { @@ -4040,53 +4669,99 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.2-dev" + "dev-master": "2.0-dev" } }, "autoload": { "classmap": [ "hamcrest" - ], - "files": [ - "hamcrest/Hamcrest.php" ] }, "notification-url": "https://packagist.org/downloads/", "license": [ - "BSD-3-Clause" + "BSD" ], "description": "This is the PHP port of Hamcrest Matchers", "keywords": [ "test" ], - "time": "2018-02-19T09:04:07+00:00" + "time": "2016-01-20T08:20:44+00:00" }, { - "name": "mockery/mockery", - "version": "0.9.x-dev", + "name": "laravel/browser-kit-testing", + "version": "v4.0.2", "source": { "type": "git", - "url": "https://github.com/mockery/mockery.git", - "reference": "e206aa48a851b95a91eeb61bfcce536d51b7cd96" + "url": "https://github.com/laravel/browser-kit-testing.git", + "reference": "efe038f40fb8ad06655ddfcb64e8b603e9e1f999" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/mockery/mockery/zipball/e206aa48a851b95a91eeb61bfcce536d51b7cd96", - "reference": "e206aa48a851b95a91eeb61bfcce536d51b7cd96", + "url": "https://api.github.com/repos/laravel/browser-kit-testing/zipball/efe038f40fb8ad06655ddfcb64e8b603e9e1f999", + "reference": "efe038f40fb8ad06655ddfcb64e8b603e9e1f999", "shasum": "" }, "require": { - "hamcrest/hamcrest-php": "~1.1", - "lib-pcre": ">=7.0", - "php": ">=5.3.2" - }, - "require-dev": { - "phpunit/phpunit": "~4.0" + "illuminate/support": "^5.6", + "php": ">=7.1.3", + "phpunit/phpunit": "~7.0", + "symfony/css-selector": "~4.0", + "symfony/dom-crawler": "~4.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "0.9.x-dev" + "dev-master": "4.0-dev" + } + }, + "autoload": { + "psr-4": { + "Laravel\\BrowserKitTesting\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Taylor Otwell", + "email": "taylor@laravel.com" + } + ], + "description": "Provides backwards compatibility for BrowserKit testing in Laravel 5.4.", + "keywords": [ + "laravel", + "testing" + ], + "time": "2018-09-26T13:42:46+00:00" + }, + { + "name": "mockery/mockery", + "version": "1.2.0", + "source": { + "type": "git", + "url": "https://github.com/mockery/mockery.git", + "reference": "100633629bf76d57430b86b7098cd6beb996a35a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/mockery/mockery/zipball/100633629bf76d57430b86b7098cd6beb996a35a", + "reference": "100633629bf76d57430b86b7098cd6beb996a35a", + "shasum": "" + }, + "require": { + "hamcrest/hamcrest-php": "~2.0", + "lib-pcre": ">=7.0", + "php": ">=5.6.0" + }, + "require-dev": { + "phpunit/phpunit": "~5.7.10|~6.5|~7.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" } }, "autoload": { @@ -4110,8 +4785,8 @@ "homepage": "http://davedevelopment.co.uk" } ], - "description": "Mockery is a simple yet flexible PHP mock object framework for use in unit testing with PHPUnit, PHPSpec or any other testing framework. Its core goal is to offer a test double framework with a succinct API capable of clearly defining all possible object operations and interactions using a human readable Domain Specific Language (DSL). Designed as a drop in alternative to PHPUnit's phpunit-mock-objects library, Mockery is easy to integrate with PHPUnit and can operate alongside phpunit-mock-objects without the World ending.", - "homepage": "http://github.com/padraic/mockery", + "description": "Mockery is a simple yet flexible PHP mock object framework", + "homepage": "https://github.com/mockery/mockery", "keywords": [ "BDD", "TDD", @@ -4124,7 +4799,220 @@ "test double", "testing" ], - "time": "2018-02-02T16:28:49+00:00" + "time": "2018-10-02T21:52:37+00:00" + }, + { + "name": "myclabs/deep-copy", + "version": "1.8.1", + "source": { + "type": "git", + "url": "https://github.com/myclabs/DeepCopy.git", + "reference": "3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8", + "reference": "3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8", + "shasum": "" + }, + "require": { + "php": "^7.1" + }, + "replace": { + "myclabs/deep-copy": "self.version" + }, + "require-dev": { + "doctrine/collections": "^1.0", + "doctrine/common": "^2.6", + "phpunit/phpunit": "^7.1" + }, + "type": "library", + "autoload": { + "psr-4": { + "DeepCopy\\": "src/DeepCopy/" + }, + "files": [ + "src/DeepCopy/deep_copy.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "Create deep copies (clones) of your objects", + "keywords": [ + "clone", + "copy", + "duplicate", + "object", + "object graph" + ], + "time": "2018-06-11T23:09:50+00:00" + }, + { + "name": "nunomaduro/collision", + "version": "v2.1.0", + "source": { + "type": "git", + "url": "https://github.com/nunomaduro/collision.git", + "reference": "1149ad9f36f61b121ae61f5f6de820fc77b51e6b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/nunomaduro/collision/zipball/1149ad9f36f61b121ae61f5f6de820fc77b51e6b", + "reference": "1149ad9f36f61b121ae61f5f6de820fc77b51e6b", + "shasum": "" + }, + "require": { + "filp/whoops": "^2.1.4", + "jakub-onderka/php-console-highlighter": "0.3.*", + "php": "^7.1", + "symfony/console": "~2.8|~3.3|~4.0" + }, + "require-dev": { + "laravel/framework": "5.7.*", + "phpstan/phpstan": "^0.10", + "phpunit/phpunit": "~7.3" + }, + "type": "library", + "extra": { + "laravel": { + "providers": [ + "NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider" + ] + } + }, + "autoload": { + "psr-4": { + "NunoMaduro\\Collision\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nuno Maduro", + "email": "enunomaduro@gmail.com" + } + ], + "description": "Cli error handling for console/command-line PHP applications.", + "keywords": [ + "artisan", + "cli", + "command-line", + "console", + "error", + "handling", + "laravel", + "laravel-zero", + "php", + "symfony" + ], + "time": "2018-10-03T20:01:54+00:00" + }, + { + "name": "phar-io/manifest", + "version": "1.0.3", + "source": { + "type": "git", + "url": "https://github.com/phar-io/manifest.git", + "reference": "7761fcacf03b4d4f16e7ccb606d4879ca431fcf4" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phar-io/manifest/zipball/7761fcacf03b4d4f16e7ccb606d4879ca431fcf4", + "reference": "7761fcacf03b4d4f16e7ccb606d4879ca431fcf4", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "ext-phar": "*", + "phar-io/version": "^2.0", + "php": "^5.6 || ^7.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Arne Blankerts", + "email": "arne@blankerts.de", + "role": "Developer" + }, + { + "name": "Sebastian Heuer", + "email": "sebastian@phpeople.de", + "role": "Developer" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "Developer" + } + ], + "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)", + "time": "2018-07-08T19:23:20+00:00" + }, + { + "name": "phar-io/version", + "version": "2.0.1", + "source": { + "type": "git", + "url": "https://github.com/phar-io/version.git", + "reference": "45a2ec53a73c70ce41d55cedef9063630abaf1b6" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phar-io/version/zipball/45a2ec53a73c70ce41d55cedef9063630abaf1b6", + "reference": "45a2ec53a73c70ce41d55cedef9063630abaf1b6", + "shasum": "" + }, + "require": { + "php": "^5.6 || ^7.0" + }, + "type": "library", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Arne Blankerts", + "email": "arne@blankerts.de", + "role": "Developer" + }, + { + "name": "Sebastian Heuer", + "email": "sebastian@phpeople.de", + "role": "Developer" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "Developer" + } + ], + "description": "Library for handling version information and constraints", + "time": "2018-07-08T19:19:57+00:00" }, { "name": "phpdocumentor/reflection-common", @@ -4182,29 +5070,35 @@ }, { "name": "phpdocumentor/reflection-docblock", - "version": "3.3.2", + "version": "4.3.0", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "bf329f6c1aadea3299f08ee804682b7c45b326a2" + "reference": "94fd0001232e47129dd3504189fa1c7225010d08" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/bf329f6c1aadea3299f08ee804682b7c45b326a2", - "reference": "bf329f6c1aadea3299f08ee804682b7c45b326a2", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/94fd0001232e47129dd3504189fa1c7225010d08", + "reference": "94fd0001232e47129dd3504189fa1c7225010d08", "shasum": "" }, "require": { - "php": "^5.6 || ^7.0", + "php": "^7.0", "phpdocumentor/reflection-common": "^1.0.0", "phpdocumentor/type-resolver": "^0.4.0", "webmozart/assert": "^1.0" }, "require-dev": { - "mockery/mockery": "^0.9.4", - "phpunit/phpunit": "^4.4" + "doctrine/instantiator": "~1.0.5", + "mockery/mockery": "^1.0", + "phpunit/phpunit": "^6.4" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.x-dev" + } + }, "autoload": { "psr-4": { "phpDocumentor\\Reflection\\": [ @@ -4223,7 +5117,7 @@ } ], "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", - "time": "2017-11-10T14:09:06+00:00" + "time": "2017-11-30T07:14:17+00:00" }, { "name": "phpdocumentor/type-resolver", @@ -4274,7 +5168,7 @@ }, { "name": "phpspec/prophecy", - "version": "dev-master", + "version": "1.8.0", "source": { "type": "git", "url": "https://github.com/phpspec/prophecy.git", @@ -4337,39 +5231,40 @@ }, { "name": "phpunit/php-code-coverage", - "version": "2.2.x-dev", + "version": "6.1.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "eabf68b476ac7d0f73793aada060f1c1a9bf8979" + "reference": "807e6013b00af69b6c5d9ceb4282d0393dbb9d8d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/eabf68b476ac7d0f73793aada060f1c1a9bf8979", - "reference": "eabf68b476ac7d0f73793aada060f1c1a9bf8979", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/807e6013b00af69b6c5d9ceb4282d0393dbb9d8d", + "reference": "807e6013b00af69b6c5d9ceb4282d0393dbb9d8d", "shasum": "" }, "require": { - "php": ">=5.3.3", - "phpunit/php-file-iterator": "~1.3", - "phpunit/php-text-template": "~1.2", - "phpunit/php-token-stream": "~1.3", - "sebastian/environment": "^1.3.2", - "sebastian/version": "~1.0" + "ext-dom": "*", + "ext-xmlwriter": "*", + "php": "^7.1", + "phpunit/php-file-iterator": "^2.0", + "phpunit/php-text-template": "^1.2.1", + "phpunit/php-token-stream": "^3.0", + "sebastian/code-unit-reverse-lookup": "^1.0.1", + "sebastian/environment": "^3.1 || ^4.0", + "sebastian/version": "^2.0.1", + "theseer/tokenizer": "^1.1" }, "require-dev": { - "ext-xdebug": ">=2.1.4", - "phpunit/phpunit": "~4" + "phpunit/phpunit": "^7.0" }, "suggest": { - "ext-dom": "*", - "ext-xdebug": ">=2.2.1", - "ext-xmlwriter": "*" + "ext-xdebug": "^2.6.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.2.x-dev" + "dev-master": "6.1-dev" } }, "autoload": { @@ -4384,7 +5279,7 @@ "authors": [ { "name": "Sebastian Bergmann", - "email": "sb@sebastian-bergmann.de", + "email": "sebastian@phpunit.de", "role": "lead" } ], @@ -4395,29 +5290,32 @@ "testing", "xunit" ], - "time": "2015-10-06T15:47:00+00:00" + "time": "2018-10-31T16:06:48+00:00" }, { "name": "phpunit/php-file-iterator", - "version": "1.4.x-dev", + "version": "2.0.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-file-iterator.git", - "reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4" + "reference": "050bedf145a257b1ff02746c31894800e5122946" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/730b01bc3e867237eaac355e06a36b85dd93a8b4", - "reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4", + "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/050bedf145a257b1ff02746c31894800e5122946", + "reference": "050bedf145a257b1ff02746c31894800e5122946", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": "^7.1" + }, + "require-dev": { + "phpunit/phpunit": "^7.1" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.4.x-dev" + "dev-master": "2.0.x-dev" } }, "autoload": { @@ -4432,7 +5330,7 @@ "authors": [ { "name": "Sebastian Bergmann", - "email": "sb@sebastian-bergmann.de", + "email": "sebastian@phpunit.de", "role": "lead" } ], @@ -4442,7 +5340,7 @@ "filesystem", "iterator" ], - "time": "2017-11-27T13:52:08+00:00" + "time": "2018-09-13T20:33:42+00:00" }, { "name": "phpunit/php-text-template", @@ -4487,28 +5385,28 @@ }, { "name": "phpunit/php-timer", - "version": "1.0.x-dev", + "version": "2.0.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-timer.git", - "reference": "9513098641797ce5f459dbc1de5a54c29b0ec1fb" + "reference": "8b8454ea6958c3dee38453d3bd571e023108c91f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/9513098641797ce5f459dbc1de5a54c29b0ec1fb", - "reference": "9513098641797ce5f459dbc1de5a54c29b0ec1fb", + "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/8b8454ea6958c3dee38453d3bd571e023108c91f", + "reference": "8b8454ea6958c3dee38453d3bd571e023108c91f", "shasum": "" }, "require": { - "php": "^5.3.3 || ^7.0" + "php": "^7.1" }, "require-dev": { - "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0" + "phpunit/phpunit": "^7.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-master": "2.0-dev" } }, "autoload": { @@ -4523,7 +5421,7 @@ "authors": [ { "name": "Sebastian Bergmann", - "email": "sb@sebastian-bergmann.de", + "email": "sebastian@phpunit.de", "role": "lead" } ], @@ -4532,33 +5430,33 @@ "keywords": [ "timer" ], - "time": "2018-01-06T05:27:16+00:00" + "time": "2018-02-01T13:07:23+00:00" }, { "name": "phpunit/php-token-stream", - "version": "1.4.x-dev", + "version": "3.0.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-token-stream.git", - "reference": "58bd196ce8bc49389307b3787934a5117db80fea" + "reference": "c99e3be9d3e85f60646f152f9002d46ed7770d18" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/58bd196ce8bc49389307b3787934a5117db80fea", - "reference": "58bd196ce8bc49389307b3787934a5117db80fea", + "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/c99e3be9d3e85f60646f152f9002d46ed7770d18", + "reference": "c99e3be9d3e85f60646f152f9002d46ed7770d18", "shasum": "" }, "require": { "ext-tokenizer": "*", - "php": ">=5.3.3" + "php": "^7.1" }, "require-dev": { - "phpunit/phpunit": "~4.2" + "phpunit/phpunit": "^7.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.4-dev" + "dev-master": "3.0-dev" } }, "autoload": { @@ -4581,45 +5479,57 @@ "keywords": [ "tokenizer" ], - "time": "2017-12-04T15:11:28+00:00" + "time": "2018-10-30T05:52:18+00:00" }, { "name": "phpunit/phpunit", - "version": "4.8.x-dev", + "version": "7.4.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "18e5f52e8412d23e739f7d8744e177039860e800" + "reference": "b1be2c8530c4c29c3519a052c9fb6cee55053bbd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/18e5f52e8412d23e739f7d8744e177039860e800", - "reference": "18e5f52e8412d23e739f7d8744e177039860e800", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/b1be2c8530c4c29c3519a052c9fb6cee55053bbd", + "reference": "b1be2c8530c4c29c3519a052c9fb6cee55053bbd", "shasum": "" }, "require": { + "doctrine/instantiator": "^1.1", "ext-dom": "*", "ext-json": "*", - "ext-pcre": "*", - "ext-reflection": "*", - "ext-spl": "*", - "php": ">=5.3.3", - "phpspec/prophecy": "^1.3.1", - "phpunit/php-code-coverage": "~2.1", - "phpunit/php-file-iterator": "~1.4", - "phpunit/php-text-template": "~1.2", - "phpunit/php-timer": "^1.0.6", - "phpunit/phpunit-mock-objects": "~2.3", - "sebastian/comparator": "~1.2.2", - "sebastian/diff": "~1.2", - "sebastian/environment": "~1.3", - "sebastian/exporter": "~1.2", - "sebastian/global-state": "~1.0", - "sebastian/version": "~1.0", - "symfony/yaml": "~2.1|~3.0" + "ext-libxml": "*", + "ext-mbstring": "*", + "ext-xml": "*", + "myclabs/deep-copy": "^1.7", + "phar-io/manifest": "^1.0.2", + "phar-io/version": "^2.0", + "php": "^7.1", + "phpspec/prophecy": "^1.7", + "phpunit/php-code-coverage": "^6.0.7", + "phpunit/php-file-iterator": "^2.0.1", + "phpunit/php-text-template": "^1.2.1", + "phpunit/php-timer": "^2.0", + "sebastian/comparator": "^3.0", + "sebastian/diff": "^3.0", + "sebastian/environment": "^3.1 || ^4.0", + "sebastian/exporter": "^3.1", + "sebastian/global-state": "^2.0", + "sebastian/object-enumerator": "^3.0.3", + "sebastian/resource-operations": "^2.0", + "sebastian/version": "^2.0.1" + }, + "conflict": { + "phpunit/phpunit-mock-objects": "*" + }, + "require-dev": { + "ext-pdo": "*" }, "suggest": { - "phpunit/php-invoker": "~1.1" + "ext-soap": "*", + "ext-xdebug": "*", + "phpunit/php-invoker": "^2.0" }, "bin": [ "phpunit" @@ -4627,7 +5537,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.8.x-dev" + "dev-master": "7.4-dev" } }, "autoload": { @@ -4653,38 +5563,32 @@ "testing", "xunit" ], - "time": "2017-06-23T12:44:27+00:00" + "time": "2018-11-14T16:52:02+00:00" }, { - "name": "phpunit/phpunit-mock-objects", - "version": "2.3.x-dev", + "name": "sebastian/code-unit-reverse-lookup", + "version": "1.0.1", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git", - "reference": "ac8e7a3db35738d56ee9a76e78a4e03d97628983" + "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git", + "reference": "4419fcdb5eabb9caa61a27c7a1db532a6b55dd18" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/ac8e7a3db35738d56ee9a76e78a4e03d97628983", - "reference": "ac8e7a3db35738d56ee9a76e78a4e03d97628983", + "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/4419fcdb5eabb9caa61a27c7a1db532a6b55dd18", + "reference": "4419fcdb5eabb9caa61a27c7a1db532a6b55dd18", "shasum": "" }, "require": { - "doctrine/instantiator": "^1.0.2", - "php": ">=5.3.3", - "phpunit/php-text-template": "~1.2", - "sebastian/exporter": "~1.2" + "php": "^5.6 || ^7.0" }, "require-dev": { - "phpunit/phpunit": "~4.4" - }, - "suggest": { - "ext-soap": "*" + "phpunit/phpunit": "^5.7 || ^6.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.3.x-dev" + "dev-master": "1.0.x-dev" } }, "autoload": { @@ -4699,44 +5603,39 @@ "authors": [ { "name": "Sebastian Bergmann", - "email": "sb@sebastian-bergmann.de", - "role": "lead" + "email": "sebastian@phpunit.de" } ], - "description": "Mock Object library for PHPUnit", - "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/", - "keywords": [ - "mock", - "xunit" - ], - "time": "2015-10-02T06:51:40+00:00" + "description": "Looks up which function or method a line of code belongs to", + "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/", + "time": "2017-03-04T06:30:41+00:00" }, { "name": "sebastian/comparator", - "version": "1.2.x-dev", + "version": "3.0.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/comparator.git", - "reference": "18a5d97c25f408f48acaf6d1b9f4079314c5996a" + "reference": "5de4fc177adf9bce8df98d8d141a7559d7ccf6da" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/18a5d97c25f408f48acaf6d1b9f4079314c5996a", - "reference": "18a5d97c25f408f48acaf6d1b9f4079314c5996a", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/5de4fc177adf9bce8df98d8d141a7559d7ccf6da", + "reference": "5de4fc177adf9bce8df98d8d141a7559d7ccf6da", "shasum": "" }, "require": { - "php": ">=5.3.3", - "sebastian/diff": "~1.2", - "sebastian/exporter": "~1.2 || ~2.0" + "php": "^7.1", + "sebastian/diff": "^3.0", + "sebastian/exporter": "^3.1" }, "require-dev": { - "phpunit/phpunit": "~4.4" + "phpunit/phpunit": "^7.1" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.2.x-dev" + "dev-master": "3.0-dev" } }, "autoload": { @@ -4767,38 +5666,39 @@ } ], "description": "Provides the functionality to compare PHP values for equality", - "homepage": "http://www.github.com/sebastianbergmann/comparator", + "homepage": "https://github.com/sebastianbergmann/comparator", "keywords": [ "comparator", "compare", "equality" ], - "time": "2017-03-07T10:34:43+00:00" + "time": "2018-07-12T15:12:46+00:00" }, { "name": "sebastian/diff", - "version": "1.4.x-dev", + "version": "3.0.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/diff.git", - "reference": "7f066a26a962dbe58ddea9f72a4e82874a3975a4" + "reference": "366541b989927187c4ca70490a35615d3fef2dce" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/7f066a26a962dbe58ddea9f72a4e82874a3975a4", - "reference": "7f066a26a962dbe58ddea9f72a4e82874a3975a4", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/366541b989927187c4ca70490a35615d3fef2dce", + "reference": "366541b989927187c4ca70490a35615d3fef2dce", "shasum": "" }, "require": { - "php": "^5.3.3 || ^7.0" + "php": "^7.1" }, "require-dev": { - "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0" + "phpunit/phpunit": "^7.0", + "symfony/process": "^2 || ^3.3 || ^4" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.4-dev" + "dev-master": "3.0-dev" } }, "autoload": { @@ -4823,34 +5723,37 @@ "description": "Diff implementation", "homepage": "https://github.com/sebastianbergmann/diff", "keywords": [ - "diff" + "diff", + "udiff", + "unidiff", + "unified diff" ], - "time": "2017-05-22T07:24:03+00:00" + "time": "2018-06-10T07:54:39+00:00" }, { "name": "sebastian/environment", - "version": "1.3.x-dev", + "version": "3.1.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/environment.git", - "reference": "67f55699c2810ff0f2cc47478bbdeda8567e68ee" + "reference": "cd0871b3975fb7fc44d11314fd1ee20925fce4f5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/67f55699c2810ff0f2cc47478bbdeda8567e68ee", - "reference": "67f55699c2810ff0f2cc47478bbdeda8567e68ee", + "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/cd0871b3975fb7fc44d11314fd1ee20925fce4f5", + "reference": "cd0871b3975fb7fc44d11314fd1ee20925fce4f5", "shasum": "" }, "require": { - "php": "^5.3.3 || ^7.0" + "php": "^7.0" }, "require-dev": { - "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0" + "phpunit/phpunit": "^6.1" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.3.x-dev" + "dev-master": "3.1.x-dev" } }, "autoload": { @@ -4875,34 +5778,34 @@ "environment", "hhvm" ], - "time": "2017-02-28T08:18:59+00:00" + "time": "2017-07-01T08:51:00+00:00" }, { "name": "sebastian/exporter", - "version": "1.2.x-dev", + "version": "3.1.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/exporter.git", - "reference": "dcd43bcc0fd3551bd2ede0081882d549bb78225d" + "reference": "234199f4528de6d12aaa58b612e98f7d36adb937" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/dcd43bcc0fd3551bd2ede0081882d549bb78225d", - "reference": "dcd43bcc0fd3551bd2ede0081882d549bb78225d", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/234199f4528de6d12aaa58b612e98f7d36adb937", + "reference": "234199f4528de6d12aaa58b612e98f7d36adb937", "shasum": "" }, "require": { - "php": "^5.3.3 || ^7.0", - "sebastian/recursion-context": "^1.0" + "php": "^7.0", + "sebastian/recursion-context": "^3.0" }, "require-dev": { "ext-mbstring": "*", - "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0" + "phpunit/phpunit": "^6.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.2.x-dev" + "dev-master": "3.1.x-dev" } }, "autoload": { @@ -4942,27 +5845,27 @@ "export", "exporter" ], - "time": "2017-02-26T13:09:30+00:00" + "time": "2017-04-03T13:19:02+00:00" }, { "name": "sebastian/global-state", - "version": "1.1.x-dev", + "version": "2.0.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/global-state.git", - "reference": "cea85a84b00f2795341ebbbca4fa396347f2494e" + "reference": "e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/cea85a84b00f2795341ebbbca4fa396347f2494e", - "reference": "cea85a84b00f2795341ebbbca4fa396347f2494e", + "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4", + "reference": "e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": "^7.0" }, "require-dev": { - "phpunit/phpunit": "~4.2|~5.0" + "phpunit/phpunit": "^6.0" }, "suggest": { "ext-uopz": "*" @@ -4970,7 +5873,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-master": "2.0-dev" } }, "autoload": { @@ -4993,32 +5896,124 @@ "keywords": [ "global state" ], - "time": "2017-02-23T14:11:06+00:00" + "time": "2017-04-27T15:39:26+00:00" }, { - "name": "sebastian/recursion-context", - "version": "1.0.x-dev", + "name": "sebastian/object-enumerator", + "version": "3.0.3", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/recursion-context.git", - "reference": "b19cc3298482a335a95f3016d2f8a6950f0fbcd7" + "url": "https://github.com/sebastianbergmann/object-enumerator.git", + "reference": "7cfd9e65d11ffb5af41198476395774d4c8a84c5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/b19cc3298482a335a95f3016d2f8a6950f0fbcd7", - "reference": "b19cc3298482a335a95f3016d2f8a6950f0fbcd7", + "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/7cfd9e65d11ffb5af41198476395774d4c8a84c5", + "reference": "7cfd9e65d11ffb5af41198476395774d4c8a84c5", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": "^7.0", + "sebastian/object-reflector": "^1.1.1", + "sebastian/recursion-context": "^3.0" }, "require-dev": { - "phpunit/phpunit": "~4.4" + "phpunit/phpunit": "^6.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "3.0.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Traverses array structures and object graphs to enumerate all referenced objects", + "homepage": "https://github.com/sebastianbergmann/object-enumerator/", + "time": "2017-08-03T12:35:26+00:00" + }, + { + "name": "sebastian/object-reflector", + "version": "1.1.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/object-reflector.git", + "reference": "773f97c67f28de00d397be301821b06708fca0be" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/773f97c67f28de00d397be301821b06708fca0be", + "reference": "773f97c67f28de00d397be301821b06708fca0be", + "shasum": "" + }, + "require": { + "php": "^7.0" + }, + "require-dev": { + "phpunit/phpunit": "^6.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.1-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Allows reflection of object attributes, including inherited and non-public ones", + "homepage": "https://github.com/sebastianbergmann/object-reflector/", + "time": "2017-03-29T09:07:27+00:00" + }, + { + "name": "sebastian/recursion-context", + "version": "3.0.0", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/recursion-context.git", + "reference": "5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8", + "reference": "5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8", + "shasum": "" + }, + "require": { + "php": "^7.0" + }, + "require-dev": { + "phpunit/phpunit": "^6.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0.x-dev" } }, "autoload": { @@ -5046,23 +6041,73 @@ ], "description": "Provides functionality to recursively process PHP variables", "homepage": "http://www.github.com/sebastianbergmann/recursion-context", - "time": "2016-10-03T07:41:43+00:00" + "time": "2017-03-03T06:23:57+00:00" }, { - "name": "sebastian/version", - "version": "1.0.6", + "name": "sebastian/resource-operations", + "version": "2.0.1", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/version.git", - "reference": "58b3a85e7999757d6ad81c787a1fbf5ff6c628c6" + "url": "https://github.com/sebastianbergmann/resource-operations.git", + "reference": "4d7a795d35b889bf80a0cc04e08d77cedfa917a9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/58b3a85e7999757d6ad81c787a1fbf5ff6c628c6", - "reference": "58b3a85e7999757d6ad81c787a1fbf5ff6c628c6", + "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/4d7a795d35b889bf80a0cc04e08d77cedfa917a9", + "reference": "4d7a795d35b889bf80a0cc04e08d77cedfa917a9", "shasum": "" }, + "require": { + "php": "^7.1" + }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Provides a list of PHP built-in functions that operate on resources", + "homepage": "https://www.github.com/sebastianbergmann/resource-operations", + "time": "2018-10-04T04:07:39+00:00" + }, + { + "name": "sebastian/version", + "version": "2.0.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/version.git", + "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/99732be0ddb3361e16ad77b68ba41efc8e979019", + "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019", + "shasum": "" + }, + "require": { + "php": ">=5.6" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0.x-dev" + } + }, "autoload": { "classmap": [ "src/" @@ -5081,81 +6126,29 @@ ], "description": "Library that helps with managing the version number of Git-hosted PHP projects", "homepage": "https://github.com/sebastianbergmann/version", - "time": "2015-06-21T13:59:46+00:00" - }, - { - "name": "symfony/css-selector", - "version": "3.1.x-dev", - "source": { - "type": "git", - "url": "https://github.com/symfony/css-selector.git", - "reference": "722a87478a72d95dc2a3bcf41dc9c2d13fd4cb2d" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/722a87478a72d95dc2a3bcf41dc9c2d13fd4cb2d", - "reference": "722a87478a72d95dc2a3bcf41dc9c2d13fd4cb2d", - "shasum": "" - }, - "require": { - "php": ">=5.5.9" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.1-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Component\\CssSelector\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Jean-François Simon", - "email": "jeanfrancois.simon@sensiolabs.com" - }, - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony CssSelector Component", - "homepage": "https://symfony.com", - "time": "2017-01-02T20:31:54+00:00" + "time": "2016-10-03T07:35:21+00:00" }, { "name": "symfony/dom-crawler", - "version": "3.1.x-dev", + "version": "v4.1.7", "source": { "type": "git", "url": "https://github.com/symfony/dom-crawler.git", - "reference": "7eede2a901a19928494194f7d1815a77b9a473a0" + "reference": "80e60271bb288de2a2259662cff125cff4f93f95" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/7eede2a901a19928494194f7d1815a77b9a473a0", - "reference": "7eede2a901a19928494194f7d1815a77b9a473a0", + "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/80e60271bb288de2a2259662cff125cff4f93f95", + "reference": "80e60271bb288de2a2259662cff125cff4f93f95", "shasum": "" }, "require": { - "php": ">=5.5.9", + "php": "^7.1.3", + "symfony/polyfill-ctype": "~1.8", "symfony/polyfill-mbstring": "~1.0" }, "require-dev": { - "symfony/css-selector": "~2.8|~3.0" + "symfony/css-selector": "~3.4|~4.0" }, "suggest": { "symfony/css-selector": "" @@ -5163,7 +6156,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.1-dev" + "dev-master": "4.1-dev" } }, "autoload": { @@ -5190,75 +6183,60 @@ ], "description": "Symfony DomCrawler Component", "homepage": "https://symfony.com", - "time": "2017-01-21T17:13:55+00:00" + "time": "2018-10-02T12:40:59+00:00" }, { - "name": "symfony/yaml", - "version": "3.3.x-dev", + "name": "theseer/tokenizer", + "version": "1.1.0", "source": { "type": "git", - "url": "https://github.com/symfony/yaml.git", - "reference": "af615970e265543a26ee712c958404eb9b7ac93d" + "url": "https://github.com/theseer/tokenizer.git", + "reference": "cb2f008f3f05af2893a87208fe6a6c4985483f8b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/af615970e265543a26ee712c958404eb9b7ac93d", - "reference": "af615970e265543a26ee712c958404eb9b7ac93d", + "url": "https://api.github.com/repos/theseer/tokenizer/zipball/cb2f008f3f05af2893a87208fe6a6c4985483f8b", + "reference": "cb2f008f3f05af2893a87208fe6a6c4985483f8b", "shasum": "" }, "require": { - "php": "^5.5.9|>=7.0.8" - }, - "require-dev": { - "symfony/console": "~2.8|~3.0" - }, - "suggest": { - "symfony/console": "For validating YAML files using the lint command" + "ext-dom": "*", + "ext-tokenizer": "*", + "ext-xmlwriter": "*", + "php": "^7.0" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.3-dev" - } - }, "autoload": { - "psr-4": { - "Symfony\\Component\\Yaml\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" + "classmap": [ + "src/" ] }, "notification-url": "https://packagist.org/downloads/", "license": [ - "MIT" + "BSD-3-Clause" ], "authors": [ { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" + "name": "Arne Blankerts", + "email": "arne@blankerts.de", + "role": "Developer" } ], - "description": "Symfony Yaml Component", - "homepage": "https://symfony.com", - "time": "2018-01-20T15:04:53+00:00" + "description": "A small library for converting tokenized PHP source code into XML and potentially other formats", + "time": "2017-04-07T12:08:54+00:00" }, { "name": "webmozart/assert", - "version": "dev-master", + "version": "1.3.0", "source": { "type": "git", "url": "https://github.com/webmozart/assert.git", - "reference": "53927dddf3afa2088b355188e143bba42159bf5d" + "reference": "0df1908962e7a3071564e857d86874dad1ef204a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/webmozart/assert/zipball/53927dddf3afa2088b355188e143bba42159bf5d", - "reference": "53927dddf3afa2088b355188e143bba42159bf5d", + "url": "https://api.github.com/repos/webmozart/assert/zipball/0df1908962e7a3071564e857d86874dad1ef204a", + "reference": "0df1908962e7a3071564e857d86874dad1ef204a", "shasum": "" }, "require": { @@ -5295,7 +6273,7 @@ "check", "validate" ], - "time": "2018-05-29T14:25:02+00:00" + "time": "2018-01-29T19:49:41+00:00" } ], "aliases": [], @@ -5304,10 +6282,12 @@ "smarcet/outlook-rest-client": 20, "idct/sftp-client": 20 }, - "prefer-stable": false, + "prefer-stable": true, "prefer-lowest": false, "platform": { - "php": ">=5.5.9" + "php": "^7.1.3", + "ext-json": "*", + "ext-pdo": "*" }, "platform-dev": [] } diff --git a/config/app.php b/config/app.php index ec7ca408..b58c6e3b 100644 --- a/config/app.php +++ b/config/app.php @@ -99,21 +99,6 @@ return [ 'cipher' => 'AES-256-CBC', - /* - |-------------------------------------------------------------------------- - | Logging Configuration - |-------------------------------------------------------------------------- - | - | Here you may configure the log settings for your application. Out of - | the box, Laravel uses the Monolog PHP logging library. This gives - | you a variety of powerful log handlers / formatters to utilize. - | - | Available Settings: "single", "daily", "syslog", "errorlog" - | - */ - - 'log' => env('APP_LOG', 'daily'), - /* |-------------------------------------------------------------------------- | Autoloaded Service Providers diff --git a/config/auth.php b/config/auth.php index c25b92e2..78175010 100644 --- a/config/auth.php +++ b/config/auth.php @@ -67,7 +67,7 @@ return [ 'providers' => [ 'users' => [ 'driver' => 'eloquent', - //'model' => App\User::class, + 'model' => App\User::class, ], // 'users' => [ @@ -81,10 +81,6 @@ return [ | Resetting Passwords |-------------------------------------------------------------------------- | - | Here you may set the options for resetting passwords including the view - | that is your password reset e-mail. You may also set the name of the - | table that maintains all of the reset tokens for your application. - | | You may specify multiple password reset configurations if you have more | than one user table or model in the application and you want to have | separate password reset settings based on the specific user types. @@ -98,7 +94,6 @@ return [ 'passwords' => [ 'users' => [ 'provider' => 'users', - 'email' => 'auth.emails.password', 'table' => 'password_resets', 'expire' => 60, ], diff --git a/config/cloudstorage.php b/config/cloudstorage.php new file mode 100644 index 00000000..a5d43d1a --- /dev/null +++ b/config/cloudstorage.php @@ -0,0 +1,23 @@ + env('CLOUD_STORAGE_BASE_URL', null), + 'container' => env('CLOUD_STORAGE_CONTAINER', null), + 'auth_url' => env('CLOUD_STORAGE_AUTH_URL', null), + 'user_name' => env('CLOUD_STORAGE_USERNAME', null), + 'api_key' => env('CLOUD_STORAGE_APIKEY', null), + 'project_name' => env('CLOUD_STORAGE_PROJECT_NAME', null), + 'region' => env('CLOUD_STORAGE_REGION', null), +]; \ No newline at end of file diff --git a/config/doctrine.php b/config/doctrine.php index 72142a53..1482454d 100644 --- a/config/doctrine.php +++ b/config/doctrine.php @@ -22,7 +22,7 @@ return [ */ 'managers' => [ 'default' => [ - 'dev' => env('APP_DEBUG'), + 'dev' => env('APP_DEBUG', true), 'meta' => env('DOCTRINE_METADATA', 'annotations'), 'connection' => env('DB_CONNECTION', 'openstackid_resources'), 'namespaces' => [ diff --git a/config/hashing.php b/config/hashing.php new file mode 100644 index 00000000..d3c8e2fb --- /dev/null +++ b/config/hashing.php @@ -0,0 +1,52 @@ + 'bcrypt', + + /* + |-------------------------------------------------------------------------- + | Bcrypt Options + |-------------------------------------------------------------------------- + | + | Here you may specify the configuration options that should be used when + | passwords are hashed using the Bcrypt algorithm. This will allow you + | to control the amount of time it takes to hash the given password. + | + */ + + 'bcrypt' => [ + 'rounds' => env('BCRYPT_ROUNDS', 10), + ], + + /* + |-------------------------------------------------------------------------- + | Argon Options + |-------------------------------------------------------------------------- + | + | Here you may specify the configuration options that should be used when + | passwords are hashed using the Argon algorithm. These will allow you + | to control the amount of time it takes to hash the given password. + | + */ + + 'argon' => [ + 'memory' => 1024, + 'threads' => 2, + 'time' => 2, + ], + +]; diff --git a/config/logging.php b/config/logging.php new file mode 100644 index 00000000..4688639c --- /dev/null +++ b/config/logging.php @@ -0,0 +1,81 @@ + env('LOG_CHANNEL', 'stack'), + + /* + |-------------------------------------------------------------------------- + | Log Channels + |-------------------------------------------------------------------------- + | + | Here you may configure the log channels for your application. Out of + | the box, Laravel uses the Monolog PHP logging library. This gives + | you a variety of powerful log handlers / formatters to utilize. + | + | Available Drivers: "single", "daily", "slack", "syslog", + | "errorlog", "monolog", + | "custom", "stack" + | + */ + + 'channels' => [ + 'stack' => [ + 'driver' => 'stack', + 'channels' => ['daily'], + ], + + 'single' => [ + 'driver' => 'single', + 'path' => storage_path('logs/laravel.log'), + 'level' => 'debug', + ], + + 'daily' => [ + 'driver' => 'daily', + 'path' => storage_path('logs/laravel.log'), + 'level' => 'debug', + 'days' => 7, + ], + + 'slack' => [ + 'driver' => 'slack', + 'url' => env('LOG_SLACK_WEBHOOK_URL'), + 'username' => 'Laravel Log', + 'emoji' => ':boom:', + 'level' => 'critical', + ], + + 'stderr' => [ + 'driver' => 'monolog', + 'handler' => StreamHandler::class, + 'with' => [ + 'stream' => 'php://stderr', + ], + ], + + 'syslog' => [ + 'driver' => 'syslog', + 'level' => 'debug', + ], + + 'errorlog' => [ + 'driver' => 'errorlog', + 'level' => 'debug', + ], + ], + +]; diff --git a/tests/AdminActionsCalendarSyncPreProcessorTest.php b/tests/AdminActionsCalendarSyncPreProcessorTest.php index f8901773..008571b8 100644 --- a/tests/AdminActionsCalendarSyncPreProcessorTest.php +++ b/tests/AdminActionsCalendarSyncPreProcessorTest.php @@ -16,6 +16,7 @@ use models\summit\ICalendarSyncInfoRepository; use models\summit\SummitEvent; use models\summit\CalendarSync\WorkQueue\AdminSummitEventActionSyncWorkRequest; use models\summit\CalendarSync\WorkQueue\AbstractCalendarSyncWorkRequest; +use Tests\TestCase; /** * Class AdminActionsCalendarSyncPreProcessorTest */ diff --git a/tests/AttendeeServiceTest.php b/tests/AttendeeServiceTest.php index 505b3f14..358fafd3 100644 --- a/tests/AttendeeServiceTest.php +++ b/tests/AttendeeServiceTest.php @@ -12,6 +12,8 @@ * limitations under the License. **/ use App\Services\Model\IAttendeeService; +use Tests\TestCase; +use Illuminate\Support\Facades\App; /** * Class AttendeeServiceTest */ diff --git a/tests/BrowserKitTestCase.php b/tests/BrowserKitTestCase.php new file mode 100644 index 00000000..5fe413bf --- /dev/null +++ b/tests/BrowserKitTestCase.php @@ -0,0 +1,54 @@ +redis = Redis::connection(); + $this->redis->flushall(); + $this->prepareForTests(); + } + + + /** + * Migrates the database and set the mailer to 'pretend'. + * This will cause the tests to run quickly. + * + */ + protected function prepareForTests() + { + Artisan::call('migrate'); + //Mail::pretend(true); + $this->seed('TestSeeder'); + } +} diff --git a/tests/CountriesApiTest.php b/tests/CountriesApiTest.php index 97b30675..28024a75 100644 --- a/tests/CountriesApiTest.php +++ b/tests/CountriesApiTest.php @@ -11,7 +11,10 @@ * See the License for the specific language governing permissions and * limitations under the License. **/ - +use Tests\TestCase; +/** + * Class CountriesApiTest + */ final class CountriesApiTest extends TestCase { public function testGetAllCountries() diff --git a/tests/CreatesApplication.php b/tests/CreatesApplication.php new file mode 100644 index 00000000..6ae91832 --- /dev/null +++ b/tests/CreatesApplication.php @@ -0,0 +1,22 @@ +make(Kernel::class)->bootstrap(); + + return $app; + } +} \ No newline at end of file diff --git a/tests/DoctrineTest.php b/tests/DoctrineTest.php index 6afb26a6..0d410aa9 100644 --- a/tests/DoctrineTest.php +++ b/tests/DoctrineTest.php @@ -1,5 +1,5 @@ get('/'); + + $response->assertStatus(200); + } +} diff --git a/tests/FilterParserTest.php b/tests/FilterParserTest.php index 0e2c868b..e3546d91 100644 --- a/tests/FilterParserTest.php +++ b/tests/FilterParserTest.php @@ -1,5 +1,5 @@ 1, 'per_page' => 10, - 'status' => ICompanyServiceRepository::Status_active, + 'status' => 'active', ); $headers = array("HTTP_Authorization" => " Bearer " . $this->access_token); $response = $this->action( "GET", - "OAuth2PublicCloudApiController@getClouds", + "PublicCloudsApiController@getAll", $params, array(), array(), @@ -57,7 +56,7 @@ class OAuth2PublicCloudApiTest extends ProtectedApiTest $headers = array("HTTP_Authorization" => " Bearer " . $this->access_token); $response = $this->action( "GET", - "OAuth2PublicCloudApiController@getCloud", + "PublicCloudsApiController@get", $params, array(), array(), @@ -81,7 +80,7 @@ class OAuth2PublicCloudApiTest extends ProtectedApiTest $headers = array("HTTP_Authorization" => " Bearer " . $this->access_token); $response = $this->action( "GET", - "OAuth2PublicCloudApiController@getCloud", + "PublicCloudsApiController@getCloud", $params, array(), array(), @@ -105,7 +104,7 @@ class OAuth2PublicCloudApiTest extends ProtectedApiTest $headers = array("HTTP_Authorization" => " Bearer " . $this->access_token); $response = $this->action( "GET", - "OAuth2PublicCloudApiController@getCloudDataCenters", + "PublicCloudsApiController@getCloudDataCenters", $params, array(), array(), diff --git a/tests/OAuth2SummitLocationsApiTest.php b/tests/OAuth2SummitLocationsApiTest.php index 3c2e05c7..bcac49b3 100644 --- a/tests/OAuth2SummitLocationsApiTest.php +++ b/tests/OAuth2SummitLocationsApiTest.php @@ -153,6 +153,41 @@ final class OAuth2SummitLocationsApiTest extends ProtectedApiTest $this->assertTrue(!is_null($locations)); } + public function testGetCurrentSummitLocationsByClassHotels($summit_id = 25) + { + $params = [ + 'id' => $summit_id, + 'page' => 1, + 'per_page' => 100, + 'filter' => [ + 'class_name=='.\models\summit\SummitHotel::ClassName, + ] + ]; + + $headers = + [ + "HTTP_Authorization" => " Bearer " . $this->access_token, + "CONTENT_TYPE" => "application/json" + ]; + + $response = $this->action + ( + "GET", + "OAuth2SummitLocationsApiController@getLocations", + $params, + [], + [], + [], + $headers + ); + + $content = $response->getContent(); + $this->assertResponseStatus(200); + + $locations = json_decode($content); + $this->assertTrue(!is_null($locations)); + } + public function testGetCurrentSummitVenues() { $params = array diff --git a/tests/OAuth2TrackGroupsApiTest.php b/tests/OAuth2TrackGroupsApiTest.php index 44a3adc8..72049501 100644 --- a/tests/OAuth2TrackGroupsApiTest.php +++ b/tests/OAuth2TrackGroupsApiTest.php @@ -111,7 +111,6 @@ final class OAuth2TrackGroupsApiTest extends ProtectedApiTest $track_group = json_decode($content); $this->assertTrue(!is_null($track_group)); $this->assertResponseStatus(200); - } /** diff --git a/tests/OAuth2TrackTagGroupsApiTest.php b/tests/OAuth2TrackTagGroupsApiTest.php index b47c9f8e..a0e26f76 100644 --- a/tests/OAuth2TrackTagGroupsApiTest.php +++ b/tests/OAuth2TrackTagGroupsApiTest.php @@ -12,6 +12,9 @@ * limitations under the License. **/ +/** + * Class OAuth2TrackTagGroupsApiTest + */ final class OAuth2TrackTagGroupsApiTest extends ProtectedApiTest { public function testGetTrackTagGroups($summit_id = 25) diff --git a/tests/ParseMultiPartFormDataInputStreamTest.php b/tests/ParseMultiPartFormDataInputStreamTest.php index f2d4ccf9..7f312d94 100644 --- a/tests/ParseMultiPartFormDataInputStreamTest.php +++ b/tests/ParseMultiPartFormDataInputStreamTest.php @@ -11,8 +11,12 @@ * See the License for the specific language governing permissions and * limitations under the License. **/ +use Tests\TestCase; -class ParseMultiPartFormDataInputStreamTest extends TestCase +/** + * Class ParseMultiPartFormDataInputStreamTest + */ +final class ParseMultiPartFormDataInputStreamTest extends TestCase { public function testParse(){ $input = <<assertTrue(count($intervals) == 4); + $this->assertTrue(count($intervals) == 3); } public function testFindSpots(){ diff --git a/tests/TestCase.php b/tests/TestCase.php index 227cd10f..bd436dcd 100644 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -1,46 +1,22 @@ -make('Illuminate\Contracts\Console\Kernel'); - $app->loadEnvironmentFrom('.env.testing'); - $instance->bootstrap(); - return $app; - } - - public function setUp() - { - parent::setUp(); - $this->redis = Redis::connection(); - $this->redis->flushall(); - $this->prepareForTests(); - } - - protected function prepareForTests() - { - Artisan::call('migrate'); - $this->seed('TestSeeder'); - } - - public function tearDown() - { - - parent::tearDown(); - } -} \ No newline at end of file + use CreatesApplication; +} diff --git a/tests/Unit/ExampleTest.php b/tests/Unit/ExampleTest.php new file mode 100644 index 00000000..e9fe19c6 --- /dev/null +++ b/tests/Unit/ExampleTest.php @@ -0,0 +1,19 @@ +assertTrue(true); + } +}