From b51738d04db3f869b16383cfa8867271ff6c131c Mon Sep 17 00:00:00 2001 From: Sayak Banerjee Date: Wed, 9 Jul 2014 21:45:15 -0500 Subject: [PATCH] Update dependencies --- bootstrap/compiled.php | 123 ++++-- composer.lock | 147 +++---- vendor/autoload.php | 2 +- vendor/composer/autoload_classmap.php | 1 + vendor/composer/autoload_real.php | 10 +- vendor/composer/installed.json | 385 +++++++++--------- .../Illuminate/Auth/EloquentUserProvider.php | 2 +- .../src/Illuminate/Cache/TaggedCache.php | 2 + .../Illuminate/Console/ConfirmableTrait.php | 4 +- .../Illuminate/Database/Eloquent/Builder.php | 2 +- .../Illuminate/Database/Eloquent/Model.php | 7 +- .../Database/Eloquent/Relations/BelongsTo.php | 12 + .../Eloquent/Relations/MorphOneOrMany.php | 2 +- .../src/Illuminate/Exception/Handler.php | 2 +- .../Foundation/Console/Optimize/config.php | 3 + .../Foundation/Console/RoutesCommand.php | 2 +- .../Foundation/Console/TailCommand.php | 2 +- .../Foundation/Console/TinkerCommand.php | 2 +- .../src/Illuminate/Foundation/changes.json | 3 +- .../Mail/Transport/MailgunTransport.php | 8 +- .../src/Illuminate/Routing/Route.php | 1 - .../src/Illuminate/Routing/Router.php | 28 +- .../src/Illuminate/Session/SessionManager.php | 1 - .../src/Illuminate/Support/Collection.php | 31 +- .../src/Illuminate/Validation/Validator.php | 46 ++- .../View/Compilers/BladeCompiler.php | 12 +- .../src/Illuminate/View/FileViewFinder.php | 2 +- .../Illuminate/Workbench/PackageCreator.php | 17 +- vendor/monolog/monolog/README.mdown | 1 + vendor/monolog/monolog/composer.json | 3 + .../src/Monolog/Formatter/LogglyFormatter.php | 2 +- .../src/Monolog/Handler/LogglyHandler.php | 5 + .../src/Monolog/Handler/SlackHandler.php | 175 ++++++++ .../Monolog/Handler/SlackHandlerTest.php | 123 ++++++ vendor/phpseclib/phpseclib/README.md | 2 +- .../phpseclib/phpseclib/phpseclib/Net/SCP.php | 4 +- vendor/predis/predis/CHANGELOG.md | 3 + .../Iterator/CursorBasedIterator.php | 22 +- .../Predis/Connection/StreamConnection.php | 2 +- .../swiftmailer/lib/classes/Swift.php | 1 - .../lib/classes/Swift/Attachment.php | 2 - .../AbstractFilterableInputStream.php | 4 - .../Swift/ByteStream/ArrayByteStream.php | 2 - .../Swift/ByteStream/FileByteStream.php | 12 +- .../ByteStream/TemporaryFileByteStream.php | 2 - .../lib/classes/Swift/CharacterReader.php | 2 - .../GenericFixedWidthReader.php | 2 - .../Swift/CharacterReader/UsAsciiReader.php | 2 - .../Swift/CharacterReader/Utf8Reader.php | 2 - .../classes/Swift/CharacterReaderFactory.php | 2 - .../SimpleCharacterReaderFactory.php | 2 - .../lib/classes/Swift/CharacterStream.php | 2 - .../CharacterStream/ArrayCharacterStream.php | 2 - .../CharacterStream/NgCharacterStream.php | 2 - .../lib/classes/Swift/ConfigurableSpool.php | 1 - .../lib/classes/Swift/DependencyContainer.php | 3 - .../lib/classes/Swift/DependencyException.php | 1 - .../lib/classes/Swift/EmbeddedFile.php | 2 - .../swiftmailer/lib/classes/Swift/Encoder.php | 2 - .../classes/Swift/Encoder/Base64Encoder.php | 2 - .../lib/classes/Swift/Encoder/QpEncoder.php | 4 - .../classes/Swift/Encoder/Rfc2231Encoder.php | 2 - .../lib/classes/Swift/Encoding.php | 2 - .../lib/classes/Swift/Events/CommandEvent.php | 2 - .../classes/Swift/Events/CommandListener.php | 2 - .../lib/classes/Swift/Events/Event.php | 2 - .../classes/Swift/Events/EventDispatcher.php | 2 - .../classes/Swift/Events/EventListener.php | 2 - .../lib/classes/Swift/Events/EventObject.php | 2 - .../classes/Swift/Events/ResponseEvent.php | 2 - .../classes/Swift/Events/ResponseListener.php | 2 - .../lib/classes/Swift/Events/SendEvent.php | 2 - .../lib/classes/Swift/Events/SendListener.php | 2 - .../Swift/Events/SimpleEventDispatcher.php | 4 - .../Swift/Events/TransportChangeEvent.php | 2 - .../Swift/Events/TransportChangeListener.php | 2 - .../Swift/Events/TransportExceptionEvent.php | 2 - .../Events/TransportExceptionListener.php | 2 - .../lib/classes/Swift/FailoverTransport.php | 2 - .../lib/classes/Swift/FileSpool.php | 1 - .../lib/classes/Swift/FileStream.php | 2 - .../lib/classes/Swift/Filterable.php | 1 - .../swiftmailer/lib/classes/Swift/Image.php | 2 - .../lib/classes/Swift/InputByteStream.php | 2 - .../lib/classes/Swift/IoException.php | 1 - .../lib/classes/Swift/KeyCache.php | 2 - .../classes/Swift/KeyCache/ArrayKeyCache.php | 4 - .../classes/Swift/KeyCache/DiskKeyCache.php | 4 - .../Swift/KeyCache/KeyCacheInputStream.php | 2 - .../classes/Swift/KeyCache/NullKeyCache.php | 2 - .../KeyCache/SimpleKeyCacheInputStream.php | 2 - .../classes/Swift/LoadBalancedTransport.php | 2 - .../lib/classes/Swift/MailTransport.php | 2 - .../swiftmailer/lib/classes/Swift/Mailer.php | 1 - .../Swift/Mailer/ArrayRecipientIterator.php | 2 - .../Swift/Mailer/RecipientIterator.php | 2 - .../lib/classes/Swift/MemorySpool.php | 1 - .../swiftmailer/lib/classes/Swift/Message.php | 157 ++++--- .../lib/classes/Swift/Mime/Attachment.php | 2 - .../classes/Swift/Mime/CharsetObserver.php | 2 - .../lib/classes/Swift/Mime/ContentEncoder.php | 2 - .../ContentEncoder/Base64ContentEncoder.php | 2 - .../ContentEncoder/NativeQpContentEncoder.php | 2 - .../ContentEncoder/PlainContentEncoder.php | 4 - .../Mime/ContentEncoder/QpContentEncoder.php | 2 - .../ContentEncoder/QpContentEncoderProxy.php | 2 - .../Mime/ContentEncoder/RawContentEncoder.php | 2 - .../lib/classes/Swift/Mime/EmbeddedFile.php | 2 - .../classes/Swift/Mime/EncodingObserver.php | 2 - .../lib/classes/Swift/Mime/Grammar.php | 2 - .../lib/classes/Swift/Mime/Header.php | 2 - .../lib/classes/Swift/Mime/HeaderEncoder.php | 2 - .../HeaderEncoder/Base64HeaderEncoder.php | 2 - .../Mime/HeaderEncoder/QpHeaderEncoder.php | 2 - .../lib/classes/Swift/Mime/HeaderFactory.php | 2 - .../lib/classes/Swift/Mime/HeaderSet.php | 2 - .../Swift/Mime/Headers/AbstractHeader.php | 4 +- .../classes/Swift/Mime/Headers/DateHeader.php | 2 - .../Mime/Headers/IdentificationHeader.php | 2 - .../Swift/Mime/Headers/MailboxHeader.php | 4 - .../Swift/Mime/Headers/OpenDKIMHeader.php | 24 +- .../Mime/Headers/ParameterizedHeader.php | 5 - .../classes/Swift/Mime/Headers/PathHeader.php | 2 - .../Swift/Mime/Headers/UnstructuredHeader.php | 2 - .../lib/classes/Swift/Mime/Message.php | 2 - .../lib/classes/Swift/Mime/MimeEntity.php | 2 - .../lib/classes/Swift/Mime/MimePart.php | 4 - .../Swift/Mime/ParameterizedHeader.php | 2 - .../Swift/Mime/SimpleHeaderFactory.php | 4 - .../classes/Swift/Mime/SimpleHeaderSet.php | 4 - .../lib/classes/Swift/Mime/SimpleMessage.php | 5 - .../classes/Swift/Mime/SimpleMimeEntity.php | 6 - .../lib/classes/Swift/MimePart.php | 2 - .../lib/classes/Swift/NullTransport.php | 1 - .../lib/classes/Swift/OutputByteStream.php | 2 - .../classes/Swift/Plugins/AntiFloodPlugin.php | 2 - .../Swift/Plugins/BandwidthMonitorPlugin.php | 2 - .../Swift/Plugins/Decorator/Replacements.php | 2 - .../classes/Swift/Plugins/DecoratorPlugin.php | 4 - .../Swift/Plugins/ImpersonatePlugin.php | 2 - .../lib/classes/Swift/Plugins/Logger.php | 2 - .../classes/Swift/Plugins/LoggerPlugin.php | 2 - .../Swift/Plugins/Loggers/ArrayLogger.php | 2 - .../Swift/Plugins/Loggers/EchoLogger.php | 2 - .../classes/Swift/Plugins/MessageLogger.php | 2 - .../Swift/Plugins/Pop/Pop3Connection.php | 2 - .../Swift/Plugins/Pop/Pop3Exception.php | 2 - .../Swift/Plugins/PopBeforeSmtpPlugin.php | 4 - .../Swift/Plugins/RedirectingPlugin.php | 4 - .../lib/classes/Swift/Plugins/Reporter.php | 2 - .../classes/Swift/Plugins/ReporterPlugin.php | 2 - .../Swift/Plugins/Reporters/HitReporter.php | 2 - .../Swift/Plugins/Reporters/HtmlReporter.php | 2 - .../lib/classes/Swift/Plugins/Sleeper.php | 2 - .../classes/Swift/Plugins/ThrottlerPlugin.php | 6 +- .../lib/classes/Swift/Plugins/Timer.php | 2 - .../lib/classes/Swift/Preferences.php | 1 - .../Swift/ReplacementFilterFactory.php | 1 - .../classes/Swift/RfcComplianceException.php | 1 - .../lib/classes/Swift/SendmailTransport.php | 2 - .../lib/classes/Swift/SignedMessage.php | 4 +- .../swiftmailer/lib/classes/Swift/Signer.php | 2 - .../lib/classes/Swift/Signers/BodySigner.php | 2 - .../lib/classes/Swift/Signers/DKIMSigner.php | 13 +- .../classes/Swift/Signers/DomainKeySigner.php | 9 +- .../classes/Swift/Signers/HeaderSigner.php | 2 - .../classes/Swift/Signers/OpenDKIMSigner.php | 46 ++- .../lib/classes/Swift/Signers/SMimeSigner.php | 2 - .../lib/classes/Swift/SmtpTransport.php | 2 - .../swiftmailer/lib/classes/Swift/Spool.php | 1 - .../lib/classes/Swift/SpoolTransport.php | 1 - .../lib/classes/Swift/StreamFilter.php | 1 - .../ByteArrayReplacementFilter.php | 1 - .../StreamFilters/StringReplacementFilter.php | 1 - .../StringReplacementFilterFactory.php | 1 - .../lib/classes/Swift/SwiftException.php | 1 - .../lib/classes/Swift/Transport.php | 2 - .../Swift/Transport/AbstractSmtpTransport.php | 5 - .../Esmtp/Auth/CramMd5Authenticator.php | 2 - .../Esmtp/Auth/LoginAuthenticator.php | 2 - .../Esmtp/Auth/NTLMAuthenticator.php | 2 - .../Esmtp/Auth/PlainAuthenticator.php | 2 - .../Esmtp/Auth/XOAuth2Authenticator.php | 8 +- .../Swift/Transport/Esmtp/AuthHandler.php | 4 - .../Swift/Transport/Esmtp/Authenticator.php | 2 - .../classes/Swift/Transport/EsmtpHandler.php | 2 - .../Swift/Transport/EsmtpTransport.php | 6 - .../Swift/Transport/FailoverTransport.php | 4 - .../lib/classes/Swift/Transport/IoBuffer.php | 2 - .../Swift/Transport/LoadBalancedTransport.php | 4 - .../classes/Swift/Transport/MailInvoker.php | 2 - .../classes/Swift/Transport/MailTransport.php | 4 - .../classes/Swift/Transport/NullTransport.php | 1 - .../Swift/Transport/SendmailTransport.php | 4 - .../Swift/Transport/SimpleMailInvoker.php | 2 - .../lib/classes/Swift/Transport/SmtpAgent.php | 2 - .../Swift/Transport/SpoolTransport.php | 1 - .../classes/Swift/Transport/StreamBuffer.php | 6 - .../lib/classes/Swift/TransportException.php | 2 - .../lib/classes/Swift/Validate.php | 1 - .../lib/dependency_maps/transport_deps.php | 2 +- .../tests/IdenticalBinaryConstraint.php | 2 - .../tests/SwiftMailerSmokeTestCase.php | 2 - .../swiftmailer/tests/SwiftMailerTestCase.php | 2 - .../NativeQpContentEncoderAcceptanceTest.php | 2 - .../QpContentEncoderAcceptanceTest.php | 2 - .../AbstractStreamBufferAcceptanceTest.php | 2 +- .../swiftmailer/tests/bootstrap.php | 4 +- .../tests/fixtures/EsmtpTransportFixture.php | 2 +- .../tests/fixtures/MimeEntityFixture.php | 4 +- .../Events/SimpleEventDispatcherTest.php | 4 +- .../tests/unit/Swift/MailerTest.php | 10 +- .../Swift/Mime/AbstractMimeEntityTest.php | 14 +- .../tests/unit/Swift/Mime/AttachmentTest.php | 3 +- .../Base64ContentEncoderTest.php | 1 - .../ContentEncoder/QpContentEncoderTest.php | 1 - .../HeaderEncoder/QpHeaderEncoderTest.php | 3 +- .../Swift/Mime/Headers/DateHeaderTest.php | 2 - .../Mime/Headers/IdentificationHeaderTest.php | 2 - .../Swift/Mime/Headers/MailboxHeaderTest.php | 2 - .../Mime/Headers/ParameterizedHeaderTest.php | 1 - .../Swift/Mime/Headers/PathHeaderTest.php | 2 - .../Mime/Headers/UnstructuredHeaderTest.php | 2 - .../Swift/Plugins/ThrottlerPluginTest.php | 2 +- .../unit/Swift/Signers/DKIMSignerTest.php | 2 +- .../unit/Swift/Signers/OpenDKIMSignerTest.php | 1 - .../AbstractSmtpEventSupportTest.php | 4 +- .../unit/Swift/Transport/AbstractSmtpTest.php | 2 - .../Swift/Transport/Esmtp/AuthHandlerTest.php | 1 - .../EsmtpTransport/ExtensionSupportTest.php | 7 +- .../Swift/Transport/FailoverTransportTest.php | 93 ++--- .../Transport/LoadBalancedTransportTest.php | 134 +++--- .../Component/BrowserKit/phpunit.xml.dist | 11 +- .../Console/Output/ConsoleOutput.php | 2 +- .../Tests/Output/ConsoleOutputTest.php | 1 + .../Component/Console/phpunit.xml.dist | 11 +- .../XPath/Extension/ExtensionInterface.php | 2 + .../XPath/Extension/NodeExtension.php | 63 +-- .../CssSelector/XPath/Translator.php | 4 +- .../Component/CssSelector/phpunit.xml.dist | 11 +- .../Symfony/Component/Debug/phpunit.xml.dist | 11 +- .../Symfony/Component/DomCrawler/Crawler.php | 4 +- .../Symfony/Component/DomCrawler/Link.php | 69 +++- .../DomCrawler/Tests/CrawlerTest.php | 42 ++ .../Component/DomCrawler/Tests/LinkTest.php | 4 + .../Component/DomCrawler/phpunit.xml.dist | 11 +- .../EventDispatcher/phpunit.xml.dist | 5 +- .../Component/Filesystem/phpunit.xml.dist | 11 +- .../Symfony/Component/Finder/phpunit.xml.dist | 11 +- .../Resources/stubs/FakeFile.php | 45 ++ .../Component/HttpFoundation/Response.php | 54 +-- .../Tests/BinaryFileResponseTest.php | 14 +- .../HttpFoundation/Tests/ResponseTest.php | 4 + .../Component/HttpFoundation/phpunit.xml.dist | 11 +- .../Symfony/Component/HttpKernel/Kernel.php | 6 +- .../Tests/Profiler/ProfilerTest.php | 8 +- .../Component/HttpKernel/phpunit.xml.dist | 5 +- .../Component/Process/ExecutableFinder.php | 2 +- .../Component/Process/ProcessBuilder.php | 15 +- .../Process/Tests/ExecutableFinderTest.php | 112 +++++ .../Component/Process/phpunit.xml.dist | 11 +- .../Component/Routing/phpunit.xml.dist | 11 +- .../Translation/Loader/PoFileLoader.php | 6 +- .../Tests/Loader/PoFileLoaderTest.php | 24 ++ .../Tests/fixtures/escaped-id-plurals.po | 10 + .../Translation/Tests/fixtures/escaped-id.po | 8 + .../Component/Translation/phpunit.xml.dist | 11 +- 267 files changed, 1539 insertions(+), 1230 deletions(-) create mode 100755 vendor/monolog/monolog/src/Monolog/Handler/SlackHandler.php create mode 100755 vendor/monolog/monolog/tests/Monolog/Handler/SlackHandlerTest.php create mode 100755 vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Resources/stubs/FakeFile.php create mode 100755 vendor/symfony/process/Symfony/Component/Process/Tests/ExecutableFinderTest.php create mode 100755 vendor/symfony/translation/Symfony/Component/Translation/Tests/fixtures/escaped-id-plurals.po create mode 100755 vendor/symfony/translation/Symfony/Component/Translation/Tests/fixtures/escaped-id.po diff --git a/bootstrap/compiled.php b/bootstrap/compiled.php index 6011aae22..6046776c9 100755 --- a/bootstrap/compiled.php +++ b/bootstrap/compiled.php @@ -3225,6 +3225,31 @@ public static function __callStatic($method, $args) } } } +namespace Illuminate\Support\Traits; + +trait MacroableTrait +{ + protected static $macros = array(); + public static function macro($name, $macro) + { + static::$macros[$name] = $macro; + } + public static function hasMacro($name) + { + return isset(static::$macros[$name]); + } + public static function __callStatic($method, $parameters) + { + if (static::hasMacro($method)) { + return call_user_func_array(static::$macros[$method], $parameters); + } + throw new \BadMethodCallException("Method {$method} does not exist."); + } + public function __call($method, $parameters) + { + return static::__callStatic($method, $parameters); + } +} namespace Illuminate\Support; use Illuminate\Support\Traits\MacroableTrait; @@ -4611,28 +4636,33 @@ public function getResourceWildcard($value) } protected function addResourceIndex($name, $base, $controller, $options) { + $uri = $this->getResourceUri($name); $action = $this->getResourceAction($name, $controller, 'index', $options); - return $this->get($this->getResourceUri($name), $action); + return $this->get($uri, $action); } protected function addResourceCreate($name, $base, $controller, $options) { + $uri = $this->getResourceUri($name) . '/create'; $action = $this->getResourceAction($name, $controller, 'create', $options); - return $this->get($this->getResourceUri($name) . '/create', $action); + return $this->get($uri, $action); } protected function addResourceStore($name, $base, $controller, $options) { + $uri = $this->getResourceUri($name); $action = $this->getResourceAction($name, $controller, 'store', $options); - return $this->post($this->getResourceUri($name), $action); + return $this->post($uri, $action); } protected function addResourceShow($name, $base, $controller, $options) { $uri = $this->getResourceUri($name) . '/{' . $base . '}'; - return $this->get($uri, $this->getResourceAction($name, $controller, 'show', $options)); + $action = $this->getResourceAction($name, $controller, 'show', $options); + return $this->get($uri, $action); } protected function addResourceEdit($name, $base, $controller, $options) { $uri = $this->getResourceUri($name) . '/{' . $base . '}/edit'; - return $this->get($uri, $this->getResourceAction($name, $controller, 'edit', $options)); + $action = $this->getResourceAction($name, $controller, 'edit', $options); + return $this->get($uri, $action); } protected function addResourceUpdate($name, $base, $controller, $options) { @@ -4642,7 +4672,8 @@ protected function addResourceUpdate($name, $base, $controller, $options) protected function addPutResourceUpdate($name, $base, $controller, $options) { $uri = $this->getResourceUri($name) . '/{' . $base . '}'; - return $this->put($uri, $this->getResourceAction($name, $controller, 'update', $options)); + $action = $this->getResourceAction($name, $controller, 'update', $options); + return $this->put($uri, $action); } protected function addPatchResourceUpdate($name, $base, $controller) { @@ -4651,8 +4682,9 @@ protected function addPatchResourceUpdate($name, $base, $controller) } protected function addResourceDestroy($name, $base, $controller, $options) { + $uri = $this->getResourceUri($name) . '/{' . $base . '}'; $action = $this->getResourceAction($name, $controller, 'destroy', $options); - return $this->delete($this->getResourceUri($name) . '/{' . $base . '}', $action); + return $this->delete($uri, $action); } public function group(array $attributes, Closure $callback) { @@ -5071,7 +5103,6 @@ public function handle(SymfonyRequest $request, $type = HttpKernelInterface::MAS } namespace Illuminate\Routing; -use Closure; use Illuminate\Http\Request; use Illuminate\Routing\Matching\UriValidator; use Illuminate\Routing\Matching\HostValidator; @@ -6270,7 +6301,7 @@ public static function findOrNew($id, $columns = array('*')) if (!is_null($model = static::find($id, $columns))) { return $model; } - return new static($columns); + return new static(); } public static function findOrFail($id, $columns = array('*')) { @@ -6336,7 +6367,7 @@ public function morphTo($name = null, $type = null, $id = null) return new MorphTo($this->newQuery(), $this, $id, null, $type, $name); } else { $instance = new $class(); - return new MorphTo(with($instance)->newQuery(), $this, $id, $instance->getKeyName(), $type, $name); + return new MorphTo($instance->newQuery(), $this, $id, $instance->getKeyName(), $type, $name); } } public function hasMany($related, $foreignKey = null, $localKey = null) @@ -6351,7 +6382,7 @@ public function hasManyThrough($related, $through, $firstKey = null, $secondKey $through = new $through(); $firstKey = $firstKey ?: $this->getForeignKey(); $secondKey = $secondKey ?: $through->getForeignKey(); - return new HasManyThrough(with(new $related())->newQuery(), $this, $through, $firstKey, $secondKey); + return new HasManyThrough((new $related())->newQuery(), $this, $through, $firstKey, $secondKey); } public function morphMany($related, $name, $type = null, $id = null, $localKey = null) { @@ -7413,6 +7444,16 @@ protected function createConnection($driver, PDO $connection, $database, $prefix } namespace Illuminate\Session; +use Symfony\Component\HttpFoundation\Request; +use Symfony\Component\HttpFoundation\Session\SessionInterface as BaseSessionInterface; +interface SessionInterface extends BaseSessionInterface +{ + public function getHandler(); + public function handlerNeedsRequest(); + public function setRequestOnHandler(Request $request); +} +namespace Illuminate\Session; + use Closure; use Carbon\Carbon; use Symfony\Component\HttpFoundation\Cookie; @@ -7785,7 +7826,6 @@ public function setRequestOnHandler(Request $request) namespace Illuminate\Session; use Illuminate\Support\Manager; -use Symfony\Component\HttpFoundation\Session\Storage\Handler\PdoSessionHandler; use Symfony\Component\HttpFoundation\Session\Storage\Handler\NullSessionHandler; class SessionManager extends Manager { @@ -9585,27 +9625,30 @@ public function prepare(Request $request) $headers = $this->headers; if ($this->isInformational() || in_array($this->statusCode, array(204, 304))) { $this->setContent(null); - } - if (!$headers->has('Content-Type')) { - $format = $request->getRequestFormat(); - if (null !== $format && ($mimeType = $request->getMimeType($format))) { - $headers->set('Content-Type', $mimeType); - } - } - $charset = $this->charset ?: 'UTF-8'; - if (!$headers->has('Content-Type')) { - $headers->set('Content-Type', 'text/html; charset=' . $charset); - } elseif (0 === stripos($headers->get('Content-Type'), 'text/') && false === stripos($headers->get('Content-Type'), 'charset')) { - $headers->set('Content-Type', $headers->get('Content-Type') . '; charset=' . $charset); - } - if ($headers->has('Transfer-Encoding')) { + $headers->remove('Content-Type'); $headers->remove('Content-Length'); - } - if ($request->isMethod('HEAD')) { - $length = $headers->get('Content-Length'); - $this->setContent(null); - if ($length) { - $headers->set('Content-Length', $length); + } else { + if (!$headers->has('Content-Type')) { + $format = $request->getRequestFormat(); + if (null !== $format && ($mimeType = $request->getMimeType($format))) { + $headers->set('Content-Type', $mimeType); + } + } + $charset = $this->charset ?: 'UTF-8'; + if (!$headers->has('Content-Type')) { + $headers->set('Content-Type', 'text/html; charset=' . $charset); + } elseif (0 === stripos($headers->get('Content-Type'), 'text/') && false === stripos($headers->get('Content-Type'), 'charset')) { + $headers->set('Content-Type', $headers->get('Content-Type') . '; charset=' . $charset); + } + if ($headers->has('Transfer-Encoding')) { + $headers->remove('Content-Length'); + } + if ($request->isMethod('HEAD')) { + $length = $headers->get('Content-Length'); + $this->setContent(null); + if ($length) { + $headers->set('Content-Length', $length); + } } } if ('HTTP/1.0' != $request->server->get('SERVER_PROTOCOL')) { @@ -9995,6 +10038,22 @@ protected function ensureIEOverSSLCompatibility(Request $request) } namespace Illuminate\Http; +use Symfony\Component\HttpFoundation\Cookie; +trait ResponseTrait +{ + public function header($key, $value, $replace = true) + { + $this->headers->set($key, $value, $replace); + return $this; + } + public function withCookie(Cookie $cookie) + { + $this->headers->setCookie($cookie); + return $this; + } +} +namespace Illuminate\Http; + use ArrayObject; use Illuminate\Support\Contracts\JsonableInterface; use Illuminate\Support\Contracts\RenderableInterface; diff --git a/composer.lock b/composer.lock index 07145160c..344b19f08 100755 --- a/composer.lock +++ b/composer.lock @@ -238,12 +238,12 @@ "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "2e73cd58ee42919166a51897b965e1135b85048c" + "reference": "e54204bce28ece4e14217e6732438e2488c0880d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/2e73cd58ee42919166a51897b965e1135b85048c", - "reference": "2e73cd58ee42919166a51897b965e1135b85048c", + "url": "https://api.github.com/repos/laravel/framework/zipball/e54204bce28ece4e14217e6732438e2488c0880d", + "reference": "e54204bce28ece4e14217e6732438e2488c0880d", "shasum": "" }, "require": { @@ -347,7 +347,7 @@ "framework", "laravel" ], - "time": "2014-06-29 00:16:51" + "time": "2014-07-09 03:03:17" }, { "name": "monolog/monolog", @@ -355,18 +355,21 @@ "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "0951050a1e9bc3a031c780e8e5a8c94bdeb9d9c4" + "reference": "8228d1ee833dbec710161ac179d1fb9ff6cd6f28" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/0951050a1e9bc3a031c780e8e5a8c94bdeb9d9c4", - "reference": "0951050a1e9bc3a031c780e8e5a8c94bdeb9d9c4", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/8228d1ee833dbec710161ac179d1fb9ff6cd6f28", + "reference": "8228d1ee833dbec710161ac179d1fb9ff6cd6f28", "shasum": "" }, "require": { "php": ">=5.3.0", "psr/log": "~1.0" }, + "provide": { + "psr/log-implementation": "1.0.0" + }, "require-dev": { "aws/aws-sdk-php": "~2.4, >2.4.8", "doctrine/couchdb": "~1.0@dev", @@ -415,7 +418,7 @@ "logging", "psr-3" ], - "time": "2014-06-20 14:09:34" + "time": "2014-06-30 13:24:53" }, { "name": "nesbot/carbon", @@ -565,12 +568,12 @@ "source": { "type": "git", "url": "https://github.com/phpseclib/phpseclib.git", - "reference": "af8f350050d4d49f06aebdd34a5530dfcdb1ca29" + "reference": "8b8c62f278e363b75ddcacaf5803710232fbd3e4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/af8f350050d4d49f06aebdd34a5530dfcdb1ca29", - "reference": "af8f350050d4d49f06aebdd34a5530dfcdb1ca29", + "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/8b8c62f278e363b75ddcacaf5803710232fbd3e4", + "reference": "8b8c62f278e363b75ddcacaf5803710232fbd3e4", "shasum": "" }, "require": { @@ -654,7 +657,7 @@ "x.509", "x509" ], - "time": "2014-06-27 12:14:15" + "time": "2014-07-05 16:36:21" }, { "name": "predis/predis", @@ -662,12 +665,12 @@ "source": { "type": "git", "url": "https://github.com/nrk/predis.git", - "reference": "8373663486b836813987ab7f0ef03d388e8fc146" + "reference": "f967ecd66b37f5fe879b6bf35fbf677465294402" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nrk/predis/zipball/8373663486b836813987ab7f0ef03d388e8fc146", - "reference": "8373663486b836813987ab7f0ef03d388e8fc146", + "url": "https://api.github.com/repos/nrk/predis/zipball/f967ecd66b37f5fe879b6bf35fbf677465294402", + "reference": "f967ecd66b37f5fe879b6bf35fbf677465294402", "shasum": "" }, "require": { @@ -704,7 +707,7 @@ "predis", "redis" ], - "time": "2014-06-23 12:25:30" + "time": "2014-07-07 09:48:01" }, { "name": "psr/log", @@ -955,12 +958,12 @@ "source": { "type": "git", "url": "https://github.com/swiftmailer/swiftmailer.git", - "reference": "0ad7a82115989ae6274b583d7d1beec04cb69b51" + "reference": "1471619d856da006a4de443355d6339325b3f46e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/0ad7a82115989ae6274b583d7d1beec04cb69b51", - "reference": "0ad7a82115989ae6274b583d7d1beec04cb69b51", + "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/1471619d856da006a4de443355d6339325b3f46e", + "reference": "1471619d856da006a4de443355d6339325b3f46e", "shasum": "" }, "require": { @@ -1001,7 +1004,7 @@ "mail", "mailer" ], - "time": "2014-06-20 15:48:17" + "time": "2014-07-03 13:54:59" }, { "name": "symfony/browser-kit", @@ -1010,12 +1013,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/BrowserKit.git", - "reference": "cc1716dafa04277a0c987aee5bce8c3cf8939de3" + "reference": "b5e807a669333ac9e7def19ef39a6e542786010d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/BrowserKit/zipball/cc1716dafa04277a0c987aee5bce8c3cf8939de3", - "reference": "cc1716dafa04277a0c987aee5bce8c3cf8939de3", + "url": "https://api.github.com/repos/symfony/BrowserKit/zipball/b5e807a669333ac9e7def19ef39a6e542786010d", + "reference": "b5e807a669333ac9e7def19ef39a6e542786010d", "shasum": "" }, "require": { @@ -1058,7 +1061,7 @@ ], "description": "Symfony BrowserKit Component", "homepage": "http://symfony.com", - "time": "2014-05-12 09:28:39" + "time": "2014-07-09 09:05:48" }, { "name": "symfony/console", @@ -1067,12 +1070,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/Console.git", - "reference": "5643ea04872456a975ca2101337a45ba7187d00a" + "reference": "2b9e4e36d132fb2b3c5efe022db5c3a2bfab40c3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Console/zipball/5643ea04872456a975ca2101337a45ba7187d00a", - "reference": "5643ea04872456a975ca2101337a45ba7187d00a", + "url": "https://api.github.com/repos/symfony/Console/zipball/2b9e4e36d132fb2b3c5efe022db5c3a2bfab40c3", + "reference": "2b9e4e36d132fb2b3c5efe022db5c3a2bfab40c3", "shasum": "" }, "require": { @@ -1115,7 +1118,7 @@ ], "description": "Symfony Console Component", "homepage": "http://symfony.com", - "time": "2014-06-20 17:38:20" + "time": "2014-07-09 09:05:48" }, { "name": "symfony/css-selector", @@ -1124,12 +1127,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/CssSelector.git", - "reference": "bcdd62af59bd3137ede467946a06d41f8644048c" + "reference": "e24b8215bf39a6a2ce0c262bc5b000724077afa9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/CssSelector/zipball/bcdd62af59bd3137ede467946a06d41f8644048c", - "reference": "bcdd62af59bd3137ede467946a06d41f8644048c", + "url": "https://api.github.com/repos/symfony/CssSelector/zipball/e24b8215bf39a6a2ce0c262bc5b000724077afa9", + "reference": "e24b8215bf39a6a2ce0c262bc5b000724077afa9", "shasum": "" }, "require": { @@ -1168,7 +1171,7 @@ ], "description": "Symfony CssSelector Component", "homepage": "http://symfony.com", - "time": "2014-05-12 09:28:39" + "time": "2014-07-09 09:05:48" }, { "name": "symfony/debug", @@ -1177,12 +1180,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/Debug.git", - "reference": "b24abbba9959f53645ebd79d4a74310c3fc248e1" + "reference": "189da713c1f8bb03f9184eb87b43ecbc732284ac" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Debug/zipball/b24abbba9959f53645ebd79d4a74310c3fc248e1", - "reference": "b24abbba9959f53645ebd79d4a74310c3fc248e1", + "url": "https://api.github.com/repos/symfony/Debug/zipball/189da713c1f8bb03f9184eb87b43ecbc732284ac", + "reference": "189da713c1f8bb03f9184eb87b43ecbc732284ac", "shasum": "" }, "require": { @@ -1225,7 +1228,7 @@ ], "description": "Symfony Debug Component", "homepage": "http://symfony.com", - "time": "2014-06-11 18:54:02" + "time": "2014-07-09 09:05:48" }, { "name": "symfony/dom-crawler", @@ -1234,12 +1237,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/DomCrawler.git", - "reference": "106db42e7c790fc0f27eeb4ce52832438d43d059" + "reference": "b3d748f9d7ae77890d935bb97445c666b83dd59e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/DomCrawler/zipball/106db42e7c790fc0f27eeb4ce52832438d43d059", - "reference": "106db42e7c790fc0f27eeb4ce52832438d43d059", + "url": "https://api.github.com/repos/symfony/DomCrawler/zipball/b3d748f9d7ae77890d935bb97445c666b83dd59e", + "reference": "b3d748f9d7ae77890d935bb97445c666b83dd59e", "shasum": "" }, "require": { @@ -1280,7 +1283,7 @@ ], "description": "Symfony DomCrawler Component", "homepage": "http://symfony.com", - "time": "2014-06-12 10:01:04" + "time": "2014-07-09 09:05:48" }, { "name": "symfony/event-dispatcher", @@ -1289,12 +1292,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/EventDispatcher.git", - "reference": "7a4f4b42886f8c2e35acb1071f157a0b8eb1bd39" + "reference": "dc2182b4275f153469321b99c3a675ef3cffafd4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/7a4f4b42886f8c2e35acb1071f157a0b8eb1bd39", - "reference": "7a4f4b42886f8c2e35acb1071f157a0b8eb1bd39", + "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/dc2182b4275f153469321b99c3a675ef3cffafd4", + "reference": "dc2182b4275f153469321b99c3a675ef3cffafd4", "shasum": "" }, "require": { @@ -1339,7 +1342,7 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "http://symfony.com", - "time": "2014-05-23 14:36:49" + "time": "2014-07-08 12:21:41" }, { "name": "symfony/filesystem", @@ -1348,12 +1351,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/Filesystem.git", - "reference": "c5535943b0d48e5cc54f5bc8088bfc0aefda7f39" + "reference": "37568a160cf9dcfac46943a9e7825b45f209a6c0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Filesystem/zipball/c5535943b0d48e5cc54f5bc8088bfc0aefda7f39", - "reference": "c5535943b0d48e5cc54f5bc8088bfc0aefda7f39", + "url": "https://api.github.com/repos/symfony/Filesystem/zipball/37568a160cf9dcfac46943a9e7825b45f209a6c0", + "reference": "37568a160cf9dcfac46943a9e7825b45f209a6c0", "shasum": "" }, "require": { @@ -1388,7 +1391,7 @@ ], "description": "Symfony Filesystem Component", "homepage": "http://symfony.com", - "time": "2014-06-20 17:41:51" + "time": "2014-07-09 09:06:26" }, { "name": "symfony/finder", @@ -1397,12 +1400,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/Finder.git", - "reference": "ef06f87eae6efe74a3a7c2c7806e9baf7bea9870" + "reference": "9f6b98ea1b963c562af8834056706d7f914d0167" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Finder/zipball/ef06f87eae6efe74a3a7c2c7806e9baf7bea9870", - "reference": "ef06f87eae6efe74a3a7c2c7806e9baf7bea9870", + "url": "https://api.github.com/repos/symfony/Finder/zipball/9f6b98ea1b963c562af8834056706d7f914d0167", + "reference": "9f6b98ea1b963c562af8834056706d7f914d0167", "shasum": "" }, "require": { @@ -1437,7 +1440,7 @@ ], "description": "Symfony Finder Component", "homepage": "http://symfony.com", - "time": "2014-06-20 17:38:20" + "time": "2014-07-09 09:05:48" }, { "name": "symfony/http-foundation", @@ -1446,12 +1449,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/HttpFoundation.git", - "reference": "69f0f702c36d030c132d90991357bc2b84da50de" + "reference": "827f0422a4ce00716dd70a442e4538386bca7e13" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/69f0f702c36d030c132d90991357bc2b84da50de", - "reference": "69f0f702c36d030c132d90991357bc2b84da50de", + "url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/827f0422a4ce00716dd70a442e4538386bca7e13", + "reference": "827f0422a4ce00716dd70a442e4538386bca7e13", "shasum": "" }, "require": { @@ -1492,7 +1495,7 @@ ], "description": "Symfony HttpFoundation Component", "homepage": "http://symfony.com", - "time": "2014-06-20 17:38:20" + "time": "2014-07-09 09:05:48" }, { "name": "symfony/http-kernel", @@ -1501,12 +1504,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/HttpKernel.git", - "reference": "565dc6789d8e93a3fd1778ccafd7293c35fb4293" + "reference": "c7d582cf30374775581f2574aaac5aeae5316411" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/HttpKernel/zipball/565dc6789d8e93a3fd1778ccafd7293c35fb4293", - "reference": "565dc6789d8e93a3fd1778ccafd7293c35fb4293", + "url": "https://api.github.com/repos/symfony/HttpKernel/zipball/c7d582cf30374775581f2574aaac5aeae5316411", + "reference": "c7d582cf30374775581f2574aaac5aeae5316411", "shasum": "" }, "require": { @@ -1565,7 +1568,7 @@ ], "description": "Symfony HttpKernel Component", "homepage": "http://symfony.com", - "time": "2014-06-12 17:00:29" + "time": "2014-07-08 18:56:57" }, { "name": "symfony/process", @@ -1574,12 +1577,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/Process.git", - "reference": "66312573dde34dcfcbd6776719382affa06a629b" + "reference": "5e53efbf61a7fbf73c79e3e08feea50f64c20bfa" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Process/zipball/66312573dde34dcfcbd6776719382affa06a629b", - "reference": "66312573dde34dcfcbd6776719382affa06a629b", + "url": "https://api.github.com/repos/symfony/Process/zipball/5e53efbf61a7fbf73c79e3e08feea50f64c20bfa", + "reference": "5e53efbf61a7fbf73c79e3e08feea50f64c20bfa", "shasum": "" }, "require": { @@ -1614,7 +1617,7 @@ ], "description": "Symfony Process Component", "homepage": "http://symfony.com", - "time": "2014-06-14 12:57:30" + "time": "2014-07-09 09:05:48" }, { "name": "symfony/routing", @@ -1623,12 +1626,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/Routing.git", - "reference": "99b4e8e2978e6a08c086fd771cc0aa66c9e80a56" + "reference": "24d5f003a794894513d67c888181ba8c3b8e0693" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Routing/zipball/99b4e8e2978e6a08c086fd771cc0aa66c9e80a56", - "reference": "99b4e8e2978e6a08c086fd771cc0aa66c9e80a56", + "url": "https://api.github.com/repos/symfony/Routing/zipball/24d5f003a794894513d67c888181ba8c3b8e0693", + "reference": "24d5f003a794894513d67c888181ba8c3b8e0693", "shasum": "" }, "require": { @@ -1682,7 +1685,7 @@ "uri", "url" ], - "time": "2014-04-23 14:08:54" + "time": "2014-07-09 09:05:48" }, { "name": "symfony/security-core", @@ -1755,12 +1758,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/Translation.git", - "reference": "5f23265dcf8927a84be832608069c9edca3cf5f4" + "reference": "3680e1ee573b96e19ddfa20aaa3f39845b74cddd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Translation/zipball/5f23265dcf8927a84be832608069c9edca3cf5f4", - "reference": "5f23265dcf8927a84be832608069c9edca3cf5f4", + "url": "https://api.github.com/repos/symfony/Translation/zipball/3680e1ee573b96e19ddfa20aaa3f39845b74cddd", + "reference": "3680e1ee573b96e19ddfa20aaa3f39845b74cddd", "shasum": "" }, "require": { @@ -1803,7 +1806,7 @@ ], "description": "Symfony Translation Component", "homepage": "http://symfony.com", - "time": "2014-05-22 13:47:45" + "time": "2014-07-09 09:05:48" } ], "packages-dev": [ diff --git a/vendor/autoload.php b/vendor/autoload.php index d592a0d08..f2592f579 100755 --- a/vendor/autoload.php +++ b/vendor/autoload.php @@ -4,4 +4,4 @@ require_once __DIR__ . '/composer' . '/autoload_real.php'; -return ComposerAutoloaderInit7ef0c89ea98a80093e3080d8beaf2c96::getLoader(); +return ComposerAutoloaderInitc00b2ac160a8e6bff29cbc060a626b71::getLoader(); diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php index 8c3fa736b..f599cfffb 100755 --- a/vendor/composer/autoload_classmap.php +++ b/vendor/composer/autoload_classmap.php @@ -51,6 +51,7 @@ 'StickyNotes\\Setup' => $baseDir . '/app/lib/Setup.php', 'StickyNotes\\System' => $baseDir . '/app/lib/System.php', 'StickyNotes\\View' => $baseDir . '/app/lib/View.php', + 'Symfony\\Component\\HttpFoundation\\Resources\\stubs\\FakeFile' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/Resources/stubs/FakeFile.php', 'UnitedPrototype\\GoogleAnalytics\\Campaign' => $vendorDir . '/googleanalytics/GoogleAnalytics/Campaign.php', 'UnitedPrototype\\GoogleAnalytics\\Config' => $vendorDir . '/googleanalytics/GoogleAnalytics/Config.php', 'UnitedPrototype\\GoogleAnalytics\\CustomVariable' => $vendorDir . '/googleanalytics/GoogleAnalytics/CustomVariable.php', diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index a07c79740..f0345320c 100755 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInit7ef0c89ea98a80093e3080d8beaf2c96 +class ComposerAutoloaderInitc00b2ac160a8e6bff29cbc060a626b71 { private static $loader; @@ -19,9 +19,9 @@ public static function getLoader() return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInit7ef0c89ea98a80093e3080d8beaf2c96', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInitc00b2ac160a8e6bff29cbc060a626b71', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(); - spl_autoload_unregister(array('ComposerAutoloaderInit7ef0c89ea98a80093e3080d8beaf2c96', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInitc00b2ac160a8e6bff29cbc060a626b71', 'loadClassLoader')); $includePaths = require __DIR__ . '/include_paths.php'; array_push($includePaths, get_include_path()); @@ -46,14 +46,14 @@ public static function getLoader() $includeFiles = require __DIR__ . '/autoload_files.php'; foreach ($includeFiles as $file) { - composerRequire7ef0c89ea98a80093e3080d8beaf2c96($file); + composerRequirec00b2ac160a8e6bff29cbc060a626b71($file); } return $loader; } } -function composerRequire7ef0c89ea98a80093e3080d8beaf2c96($file) +function composerRequirec00b2ac160a8e6bff29cbc060a626b71($file) { require $file; } diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 8233e13a5..7723f87d6 100755 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -298,12 +298,12 @@ "source": { "type": "git", "url": "https://github.com/phpseclib/phpseclib.git", - "reference": "af8f350050d4d49f06aebdd34a5530dfcdb1ca29" + "reference": "8b8c62f278e363b75ddcacaf5803710232fbd3e4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/af8f350050d4d49f06aebdd34a5530dfcdb1ca29", - "reference": "af8f350050d4d49f06aebdd34a5530dfcdb1ca29", + "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/8b8c62f278e363b75ddcacaf5803710232fbd3e4", + "reference": "8b8c62f278e363b75ddcacaf5803710232fbd3e4", "shasum": "" }, "require": { @@ -319,7 +319,7 @@ "ext-mcrypt": "Install the Mcrypt extension in order to speed up a wide variety of cryptographic operations.", "pear-pear/PHP_Compat": "Install PHP_Compat to get phpseclib working on PHP < 4.3.3." }, - "time": "2014-06-27 12:14:15", + "time": "2014-07-05 16:36:21", "type": "library", "extra": { "branch-alias": { @@ -577,12 +577,12 @@ "source": { "type": "git", "url": "https://github.com/swiftmailer/swiftmailer.git", - "reference": "0ad7a82115989ae6274b583d7d1beec04cb69b51" + "reference": "1471619d856da006a4de443355d6339325b3f46e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/0ad7a82115989ae6274b583d7d1beec04cb69b51", - "reference": "0ad7a82115989ae6274b583d7d1beec04cb69b51", + "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/1471619d856da006a4de443355d6339325b3f46e", + "reference": "1471619d856da006a4de443355d6339325b3f46e", "shasum": "" }, "require": { @@ -591,7 +591,7 @@ "require-dev": { "mockery/mockery": "~0.9.1" }, - "time": "2014-06-20 15:48:17", + "time": "2014-07-03 13:54:59", "type": "library", "extra": { "branch-alias": { @@ -634,18 +634,18 @@ "source": { "type": "git", "url": "https://github.com/symfony/Filesystem.git", - "reference": "c5535943b0d48e5cc54f5bc8088bfc0aefda7f39" + "reference": "37568a160cf9dcfac46943a9e7825b45f209a6c0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Filesystem/zipball/c5535943b0d48e5cc54f5bc8088bfc0aefda7f39", - "reference": "c5535943b0d48e5cc54f5bc8088bfc0aefda7f39", + "url": "https://api.github.com/repos/symfony/Filesystem/zipball/37568a160cf9dcfac46943a9e7825b45f209a6c0", + "reference": "37568a160cf9dcfac46943a9e7825b45f209a6c0", "shasum": "" }, "require": { "php": ">=5.3.3" }, - "time": "2014-06-20 17:41:51", + "time": "2014-07-09 09:06:26", "type": "library", "extra": { "branch-alias": { @@ -685,12 +685,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/EventDispatcher.git", - "reference": "7a4f4b42886f8c2e35acb1071f157a0b8eb1bd39" + "reference": "dc2182b4275f153469321b99c3a675ef3cffafd4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/7a4f4b42886f8c2e35acb1071f157a0b8eb1bd39", - "reference": "7a4f4b42886f8c2e35acb1071f157a0b8eb1bd39", + "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/dc2182b4275f153469321b99c3a675ef3cffafd4", + "reference": "dc2182b4275f153469321b99c3a675ef3cffafd4", "shasum": "" }, "require": { @@ -706,7 +706,7 @@ "symfony/dependency-injection": "", "symfony/http-kernel": "" }, - "time": "2014-05-23 14:36:49", + "time": "2014-07-08 12:21:41", "type": "library", "extra": { "branch-alias": { @@ -797,18 +797,21 @@ "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "0951050a1e9bc3a031c780e8e5a8c94bdeb9d9c4" + "reference": "8228d1ee833dbec710161ac179d1fb9ff6cd6f28" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/0951050a1e9bc3a031c780e8e5a8c94bdeb9d9c4", - "reference": "0951050a1e9bc3a031c780e8e5a8c94bdeb9d9c4", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/8228d1ee833dbec710161ac179d1fb9ff6cd6f28", + "reference": "8228d1ee833dbec710161ac179d1fb9ff6cd6f28", "shasum": "" }, "require": { "php": ">=5.3.0", "psr/log": "~1.0" }, + "provide": { + "psr/log-implementation": "1.0.0" + }, "require-dev": { "aws/aws-sdk-php": "~2.4, >2.4.8", "doctrine/couchdb": "~1.0@dev", @@ -827,7 +830,7 @@ "rollbar/rollbar": "Allow sending log messages to Rollbar", "ruflin/elastica": "Allow sending log messages to an Elastic Search server" }, - "time": "2014-06-20 14:09:34", + "time": "2014-06-30 13:24:53", "type": "library", "extra": { "branch-alias": { @@ -920,6 +923,125 @@ "zf2" ] }, + { + "name": "patchwork/utf8", + "version": "v1.1.24", + "version_normalized": "1.1.24.0", + "source": { + "type": "git", + "url": "https://github.com/nicolas-grekas/Patchwork-UTF8.git", + "reference": "40f552c019956f446553b19f7de2da2f9c74d730" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/nicolas-grekas/Patchwork-UTF8/zipball/40f552c019956f446553b19f7de2da2f9c74d730", + "reference": "40f552c019956f446553b19f7de2da2f9c74d730", + "shasum": "" + }, + "require": { + "lib-pcre": ">=7.3", + "php": ">=5.3.0" + }, + "suggest": { + "ext-iconv": "Use iconv for best performance", + "ext-intl": "Use Intl for best performance", + "ext-mbstring": "Use Mbstring for best performance" + }, + "time": "2014-06-17 08:23:06", + "type": "library", + "installation-source": "dist", + "autoload": { + "psr-0": { + "Patchwork": "class/", + "Normalizer": "class/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "(Apache-2.0 or GPL-2.0)" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com", + "role": "Developer" + } + ], + "description": "Extensive, portable and performant handling of UTF-8 and grapheme clusters for PHP", + "homepage": "https://github.com/nicolas-grekas/Patchwork-UTF8", + "keywords": [ + "i18n", + "unicode", + "utf-8", + "utf8" + ] + }, + { + "name": "symfony/security-core", + "version": "2.5.x-dev", + "version_normalized": "2.5.9999999.9999999-dev", + "target-dir": "Symfony/Component/Security/Core", + "source": { + "type": "git", + "url": "https://github.com/symfony/security-core.git", + "reference": "dfc7d40b0a4d2f5ccc743eba08f840743f4ea984" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/security-core/zipball/dfc7d40b0a4d2f5ccc743eba08f840743f4ea984", + "reference": "dfc7d40b0a4d2f5ccc743eba08f840743f4ea984", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "require-dev": { + "ircmaxell/password-compat": "1.0.*", + "psr/log": "~1.0", + "symfony/event-dispatcher": "~2.1", + "symfony/expression-language": "~2.4", + "symfony/http-foundation": "~2.4", + "symfony/validator": "~2.2" + }, + "suggest": { + "ircmaxell/password-compat": "For using the BCrypt password encoder in PHP <5.5", + "symfony/event-dispatcher": "", + "symfony/expression-language": "For using the expression voter", + "symfony/http-foundation": "", + "symfony/validator": "For using the user password constraint" + }, + "time": "2014-06-23 07:34:27", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.5-dev" + } + }, + "installation-source": "dist", + "autoload": { + "psr-0": { + "Symfony\\Component\\Security\\Core\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com", + "homepage": "http://fabien.potencier.org", + "role": "Lead Developer" + }, + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + } + ], + "description": "Symfony Security Component - Core Library", + "homepage": "http://symfony.com" + }, { "name": "symfony/translation", "version": "2.5.x-dev", @@ -928,12 +1050,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/Translation.git", - "reference": "5f23265dcf8927a84be832608069c9edca3cf5f4" + "reference": "3680e1ee573b96e19ddfa20aaa3f39845b74cddd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Translation/zipball/5f23265dcf8927a84be832608069c9edca3cf5f4", - "reference": "5f23265dcf8927a84be832608069c9edca3cf5f4", + "url": "https://api.github.com/repos/symfony/Translation/zipball/3680e1ee573b96e19ddfa20aaa3f39845b74cddd", + "reference": "3680e1ee573b96e19ddfa20aaa3f39845b74cddd", "shasum": "" }, "require": { @@ -947,7 +1069,7 @@ "symfony/config": "", "symfony/yaml": "" }, - "time": "2014-05-22 13:47:45", + "time": "2014-07-09 09:05:48", "type": "library", "extra": { "branch-alias": { @@ -987,12 +1109,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/Routing.git", - "reference": "99b4e8e2978e6a08c086fd771cc0aa66c9e80a56" + "reference": "24d5f003a794894513d67c888181ba8c3b8e0693" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Routing/zipball/99b4e8e2978e6a08c086fd771cc0aa66c9e80a56", - "reference": "99b4e8e2978e6a08c086fd771cc0aa66c9e80a56", + "url": "https://api.github.com/repos/symfony/Routing/zipball/24d5f003a794894513d67c888181ba8c3b8e0693", + "reference": "24d5f003a794894513d67c888181ba8c3b8e0693", "shasum": "" }, "require": { @@ -1011,7 +1133,7 @@ "symfony/expression-language": "For using expression matching", "symfony/yaml": "For using the YAML loader" }, - "time": "2014-04-23 14:08:54", + "time": "2014-07-09 09:05:48", "type": "library", "extra": { "branch-alias": { @@ -1057,18 +1179,18 @@ "source": { "type": "git", "url": "https://github.com/symfony/CssSelector.git", - "reference": "bcdd62af59bd3137ede467946a06d41f8644048c" + "reference": "e24b8215bf39a6a2ce0c262bc5b000724077afa9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/CssSelector/zipball/bcdd62af59bd3137ede467946a06d41f8644048c", - "reference": "bcdd62af59bd3137ede467946a06d41f8644048c", + "url": "https://api.github.com/repos/symfony/CssSelector/zipball/e24b8215bf39a6a2ce0c262bc5b000724077afa9", + "reference": "e24b8215bf39a6a2ce0c262bc5b000724077afa9", "shasum": "" }, "require": { "php": ">=5.3.3" }, - "time": "2014-05-12 09:28:39", + "time": "2014-07-09 09:05:48", "type": "library", "extra": { "branch-alias": { @@ -1112,12 +1234,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/BrowserKit.git", - "reference": "cc1716dafa04277a0c987aee5bce8c3cf8939de3" + "reference": "b5e807a669333ac9e7def19ef39a6e542786010d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/BrowserKit/zipball/cc1716dafa04277a0c987aee5bce8c3cf8939de3", - "reference": "cc1716dafa04277a0c987aee5bce8c3cf8939de3", + "url": "https://api.github.com/repos/symfony/BrowserKit/zipball/b5e807a669333ac9e7def19ef39a6e542786010d", + "reference": "b5e807a669333ac9e7def19ef39a6e542786010d", "shasum": "" }, "require": { @@ -1131,7 +1253,7 @@ "suggest": { "symfony/process": "" }, - "time": "2014-05-12 09:28:39", + "time": "2014-07-09 09:05:48", "type": "library", "extra": { "branch-alias": { @@ -1171,12 +1293,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/DomCrawler.git", - "reference": "106db42e7c790fc0f27eeb4ce52832438d43d059" + "reference": "b3d748f9d7ae77890d935bb97445c666b83dd59e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/DomCrawler/zipball/106db42e7c790fc0f27eeb4ce52832438d43d059", - "reference": "106db42e7c790fc0f27eeb4ce52832438d43d059", + "url": "https://api.github.com/repos/symfony/DomCrawler/zipball/b3d748f9d7ae77890d935bb97445c666b83dd59e", + "reference": "b3d748f9d7ae77890d935bb97445c666b83dd59e", "shasum": "" }, "require": { @@ -1188,7 +1310,7 @@ "suggest": { "symfony/css-selector": "" }, - "time": "2014-06-12 10:01:04", + "time": "2014-07-09 09:05:48", "type": "library", "extra": { "branch-alias": { @@ -1220,59 +1342,6 @@ "description": "Symfony DomCrawler Component", "homepage": "http://symfony.com" }, - { - "name": "patchwork/utf8", - "version": "v1.1.24", - "version_normalized": "1.1.24.0", - "source": { - "type": "git", - "url": "https://github.com/nicolas-grekas/Patchwork-UTF8.git", - "reference": "40f552c019956f446553b19f7de2da2f9c74d730" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/nicolas-grekas/Patchwork-UTF8/zipball/40f552c019956f446553b19f7de2da2f9c74d730", - "reference": "40f552c019956f446553b19f7de2da2f9c74d730", - "shasum": "" - }, - "require": { - "lib-pcre": ">=7.3", - "php": ">=5.3.0" - }, - "suggest": { - "ext-iconv": "Use iconv for best performance", - "ext-intl": "Use Intl for best performance", - "ext-mbstring": "Use Mbstring for best performance" - }, - "time": "2014-06-17 08:23:06", - "type": "library", - "installation-source": "dist", - "autoload": { - "psr-0": { - "Patchwork": "class/", - "Normalizer": "class/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "(Apache-2.0 or GPL-2.0)" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com", - "role": "Developer" - } - ], - "description": "Extensive, portable and performant handling of UTF-8 and grapheme clusters for PHP", - "homepage": "https://github.com/nicolas-grekas/Patchwork-UTF8", - "keywords": [ - "i18n", - "unicode", - "utf-8", - "utf8" - ] - }, { "name": "symfony/http-kernel", "version": "2.5.x-dev", @@ -1281,12 +1350,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/HttpKernel.git", - "reference": "565dc6789d8e93a3fd1778ccafd7293c35fb4293" + "reference": "c7d582cf30374775581f2574aaac5aeae5316411" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/HttpKernel/zipball/565dc6789d8e93a3fd1778ccafd7293c35fb4293", - "reference": "565dc6789d8e93a3fd1778ccafd7293c35fb4293", + "url": "https://api.github.com/repos/symfony/HttpKernel/zipball/c7d582cf30374775581f2574aaac5aeae5316411", + "reference": "c7d582cf30374775581f2574aaac5aeae5316411", "shasum": "" }, "require": { @@ -1316,7 +1385,7 @@ "symfony/dependency-injection": "", "symfony/finder": "" }, - "time": "2014-06-12 17:00:29", + "time": "2014-07-08 18:56:57", "type": "library", "extra": { "branch-alias": { @@ -1356,12 +1425,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/Debug.git", - "reference": "b24abbba9959f53645ebd79d4a74310c3fc248e1" + "reference": "189da713c1f8bb03f9184eb87b43ecbc732284ac" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Debug/zipball/b24abbba9959f53645ebd79d4a74310c3fc248e1", - "reference": "b24abbba9959f53645ebd79d4a74310c3fc248e1", + "url": "https://api.github.com/repos/symfony/Debug/zipball/189da713c1f8bb03f9184eb87b43ecbc732284ac", + "reference": "189da713c1f8bb03f9184eb87b43ecbc732284ac", "shasum": "" }, "require": { @@ -1375,7 +1444,7 @@ "symfony/http-foundation": "", "symfony/http-kernel": "" }, - "time": "2014-06-11 18:54:02", + "time": "2014-07-09 09:05:48", "type": "library", "extra": { "branch-alias": { @@ -1415,18 +1484,18 @@ "source": { "type": "git", "url": "https://github.com/symfony/Process.git", - "reference": "66312573dde34dcfcbd6776719382affa06a629b" + "reference": "5e53efbf61a7fbf73c79e3e08feea50f64c20bfa" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Process/zipball/66312573dde34dcfcbd6776719382affa06a629b", - "reference": "66312573dde34dcfcbd6776719382affa06a629b", + "url": "https://api.github.com/repos/symfony/Process/zipball/5e53efbf61a7fbf73c79e3e08feea50f64c20bfa", + "reference": "5e53efbf61a7fbf73c79e3e08feea50f64c20bfa", "shasum": "" }, "require": { "php": ">=5.3.3" }, - "time": "2014-06-14 12:57:30", + "time": "2014-07-09 09:05:48", "type": "library", "extra": { "branch-alias": { @@ -1458,72 +1527,6 @@ "description": "Symfony Process Component", "homepage": "http://symfony.com" }, - { - "name": "symfony/security-core", - "version": "2.5.x-dev", - "version_normalized": "2.5.9999999.9999999-dev", - "target-dir": "Symfony/Component/Security/Core", - "source": { - "type": "git", - "url": "https://github.com/symfony/security-core.git", - "reference": "dfc7d40b0a4d2f5ccc743eba08f840743f4ea984" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/security-core/zipball/dfc7d40b0a4d2f5ccc743eba08f840743f4ea984", - "reference": "dfc7d40b0a4d2f5ccc743eba08f840743f4ea984", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "require-dev": { - "ircmaxell/password-compat": "1.0.*", - "psr/log": "~1.0", - "symfony/event-dispatcher": "~2.1", - "symfony/expression-language": "~2.4", - "symfony/http-foundation": "~2.4", - "symfony/validator": "~2.2" - }, - "suggest": { - "ircmaxell/password-compat": "For using the BCrypt password encoder in PHP <5.5", - "symfony/event-dispatcher": "", - "symfony/expression-language": "For using the expression voter", - "symfony/http-foundation": "", - "symfony/validator": "For using the user password constraint" - }, - "time": "2014-06-23 07:34:27", - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.5-dev" - } - }, - "installation-source": "dist", - "autoload": { - "psr-0": { - "Symfony\\Component\\Security\\Core\\": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com", - "homepage": "http://fabien.potencier.org", - "role": "Lead Developer" - }, - { - "name": "Symfony Community", - "homepage": "http://symfony.com/contributors" - } - ], - "description": "Symfony Security Component - Core Library", - "homepage": "http://symfony.com" - }, { "name": "symfony/finder", "version": "2.5.x-dev", @@ -1532,18 +1535,18 @@ "source": { "type": "git", "url": "https://github.com/symfony/Finder.git", - "reference": "ef06f87eae6efe74a3a7c2c7806e9baf7bea9870" + "reference": "9f6b98ea1b963c562af8834056706d7f914d0167" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Finder/zipball/ef06f87eae6efe74a3a7c2c7806e9baf7bea9870", - "reference": "ef06f87eae6efe74a3a7c2c7806e9baf7bea9870", + "url": "https://api.github.com/repos/symfony/Finder/zipball/9f6b98ea1b963c562af8834056706d7f914d0167", + "reference": "9f6b98ea1b963c562af8834056706d7f914d0167", "shasum": "" }, "require": { "php": ">=5.3.3" }, - "time": "2014-06-20 17:38:20", + "time": "2014-07-09 09:05:48", "type": "library", "extra": { "branch-alias": { @@ -1583,12 +1586,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/Console.git", - "reference": "5643ea04872456a975ca2101337a45ba7187d00a" + "reference": "2b9e4e36d132fb2b3c5efe022db5c3a2bfab40c3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Console/zipball/5643ea04872456a975ca2101337a45ba7187d00a", - "reference": "5643ea04872456a975ca2101337a45ba7187d00a", + "url": "https://api.github.com/repos/symfony/Console/zipball/2b9e4e36d132fb2b3c5efe022db5c3a2bfab40c3", + "reference": "2b9e4e36d132fb2b3c5efe022db5c3a2bfab40c3", "shasum": "" }, "require": { @@ -1602,7 +1605,7 @@ "psr/log": "For using the console logger", "symfony/event-dispatcher": "" }, - "time": "2014-06-20 17:38:20", + "time": "2014-07-09 09:05:48", "type": "library", "extra": { "branch-alias": { @@ -1641,12 +1644,12 @@ "source": { "type": "git", "url": "https://github.com/nrk/predis.git", - "reference": "8373663486b836813987ab7f0ef03d388e8fc146" + "reference": "f967ecd66b37f5fe879b6bf35fbf677465294402" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nrk/predis/zipball/8373663486b836813987ab7f0ef03d388e8fc146", - "reference": "8373663486b836813987ab7f0ef03d388e8fc146", + "url": "https://api.github.com/repos/nrk/predis/zipball/f967ecd66b37f5fe879b6bf35fbf677465294402", + "reference": "f967ecd66b37f5fe879b6bf35fbf677465294402", "shasum": "" }, "require": { @@ -1659,7 +1662,7 @@ "ext-curl": "Allows access to Webdis when paired with phpiredis", "ext-phpiredis": "Allows faster serialization and deserialization of the Redis protocol" }, - "time": "2014-06-23 12:25:30", + "time": "2014-07-07 09:48:01", "type": "library", "installation-source": "dist", "autoload": { @@ -1694,12 +1697,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/HttpFoundation.git", - "reference": "69f0f702c36d030c132d90991357bc2b84da50de" + "reference": "827f0422a4ce00716dd70a442e4538386bca7e13" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/69f0f702c36d030c132d90991357bc2b84da50de", - "reference": "69f0f702c36d030c132d90991357bc2b84da50de", + "url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/827f0422a4ce00716dd70a442e4538386bca7e13", + "reference": "827f0422a4ce00716dd70a442e4538386bca7e13", "shasum": "" }, "require": { @@ -1708,7 +1711,7 @@ "require-dev": { "symfony/expression-language": "~2.4" }, - "time": "2014-06-20 17:38:20", + "time": "2014-07-09 09:05:48", "type": "library", "extra": { "branch-alias": { @@ -1750,12 +1753,12 @@ "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "2e73cd58ee42919166a51897b965e1135b85048c" + "reference": "e54204bce28ece4e14217e6732438e2488c0880d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/2e73cd58ee42919166a51897b965e1135b85048c", - "reference": "2e73cd58ee42919166a51897b965e1135b85048c", + "url": "https://api.github.com/repos/laravel/framework/zipball/e54204bce28ece4e14217e6732438e2488c0880d", + "reference": "e54204bce28ece4e14217e6732438e2488c0880d", "shasum": "" }, "require": { @@ -1825,7 +1828,7 @@ "suggest": { "doctrine/dbal": "Allow renaming columns and dropping SQLite columns." }, - "time": "2014-06-29 00:16:51", + "time": "2014-07-09 03:03:17", "type": "library", "extra": { "branch-alias": { diff --git a/vendor/laravel/framework/src/Illuminate/Auth/EloquentUserProvider.php b/vendor/laravel/framework/src/Illuminate/Auth/EloquentUserProvider.php index a546add8f..af2507c18 100755 --- a/vendor/laravel/framework/src/Illuminate/Auth/EloquentUserProvider.php +++ b/vendor/laravel/framework/src/Illuminate/Auth/EloquentUserProvider.php @@ -43,7 +43,7 @@ public function retrieveById($identifier) } /** - * Retrieve a user by by their unique identifier and "remember me" token. + * Retrieve a user by their unique identifier and "remember me" token. * * @param mixed $identifier * @param string $token diff --git a/vendor/laravel/framework/src/Illuminate/Cache/TaggedCache.php b/vendor/laravel/framework/src/Illuminate/Cache/TaggedCache.php index a2cbae18f..b79fd3392 100755 --- a/vendor/laravel/framework/src/Illuminate/Cache/TaggedCache.php +++ b/vendor/laravel/framework/src/Illuminate/Cache/TaggedCache.php @@ -1,6 +1,8 @@ comment('Command Cancelled!'); + $this->comment('Command Cancelled!'); - return false; + return false; } } diff --git a/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Builder.php b/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Builder.php index 3d92ac00a..dfd881885 100755 --- a/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Builder.php +++ b/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Builder.php @@ -74,7 +74,7 @@ public function find($id, $columns = array('*')) { if (is_array($id)) { - return $this->findMany($id, $columns); + return $this->findMany($id, $columns); } $this->query->where($this->model->getKeyName(), '=', $id); diff --git a/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Model.php b/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Model.php index cfc0a66b8..53748a893 100755 --- a/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Model.php +++ b/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Model.php @@ -655,7 +655,7 @@ public static function findOrNew($id, $columns = array('*')) { if ( ! is_null($model = static::find($id, $columns))) return $model; - return new static($columns); + return new static; } /** @@ -829,7 +829,7 @@ public function morphTo($name = null, $type = null, $id = null) $instance = new $class; return new MorphTo( - with($instance)->newQuery(), $this, $id, $instance->getKeyName(), $type, $name + $instance->newQuery(), $this, $id, $instance->getKeyName(), $type, $name ); } } @@ -870,7 +870,7 @@ public function hasManyThrough($related, $through, $firstKey = null, $secondKey $secondKey = $secondKey ?: $through->getForeignKey(); - return new HasManyThrough(with(new $related)->newQuery(), $this, $through, $firstKey, $secondKey); + return new HasManyThrough((new $related)->newQuery(), $this, $through, $firstKey, $secondKey); } /** @@ -1081,6 +1081,7 @@ public static function destroy($ids) * Delete the model from the database. * * @return bool|null + * @throws \Exception */ public function delete() { diff --git a/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/BelongsTo.php b/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/BelongsTo.php index ec78aebac..8cd133761 100755 --- a/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/BelongsTo.php +++ b/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/BelongsTo.php @@ -207,6 +207,18 @@ public function associate(Model $model) return $this->parent->setRelation($this->relation, $model); } + /** + * Dissociate previously associated model from the given parent. + * + * @return \Illuminate\Database\Eloquent\Model + */ + public function dissociate() + { + $this->parent->setAttribute($this->foreignKey, null); + + return $this->parent->setRelation($this->relation, null); + } + /** * Update the parent model on the relationship. * diff --git a/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/MorphOneOrMany.php b/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/MorphOneOrMany.php index a9c28bde4..f4113d44d 100755 --- a/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/MorphOneOrMany.php +++ b/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/MorphOneOrMany.php @@ -55,7 +55,7 @@ public function addConstraints() } /** - * Add the constraints for a relationship count query. + * Get the relationship count query. * * @param \Illuminate\Database\Eloquent\Builder $query * @param \Illuminate\Database\Eloquent\Builder $parent diff --git a/vendor/laravel/framework/src/Illuminate/Exception/Handler.php b/vendor/laravel/framework/src/Illuminate/Exception/Handler.php index 21890a74e..bbb5717bd 100755 --- a/vendor/laravel/framework/src/Illuminate/Exception/Handler.php +++ b/vendor/laravel/framework/src/Illuminate/Exception/Handler.php @@ -199,7 +199,7 @@ public function handleShutdown() */ protected function isFatal($type) { - return in_array($type, array(E_ERROR, E_CORE_ERROR, E_COMPILE_ERROR, E_PARSE)); + return in_array($type, array(E_ERROR, E_CORE_ERROR, E_COMPILE_ERROR, E_PARSE)); } /** diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/Console/Optimize/config.php b/vendor/laravel/framework/src/Illuminate/Foundation/Console/Optimize/config.php index f038315c1..3d6e75b70 100755 --- a/vendor/laravel/framework/src/Illuminate/Foundation/Console/Optimize/config.php +++ b/vendor/laravel/framework/src/Illuminate/Foundation/Console/Optimize/config.php @@ -30,6 +30,7 @@ $basePath.'/vendor/laravel/framework/src/Illuminate/Routing/RoutingServiceProvider.php', $basePath.'/vendor/laravel/framework/src/Illuminate/Events/EventServiceProvider.php', $basePath.'/vendor/laravel/framework/src/Illuminate/Support/Facades/Facade.php', + $basePath.'/vendor/laravel/framework/src/Illuminate/Support/Traits/MacroableTrait.php', $basePath.'/vendor/laravel/framework/src/Illuminate/Support/Str.php', $basePath.'/vendor/symfony/debug/Symfony/Component/Debug/ErrorHandler.php', $basePath.'/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Debug/ErrorHandler.php', @@ -68,6 +69,7 @@ $basePath.'/vendor/laravel/framework/src/Illuminate/Database/DatabaseManager.php', $basePath.'/vendor/laravel/framework/src/Illuminate/Database/ConnectionResolverInterface.php', $basePath.'/vendor/laravel/framework/src/Illuminate/Database/Connectors/ConnectionFactory.php', + $basePath.'/vendor/laravel/framework/src/Illuminate/Session/SessionInterface.php', $basePath.'/vendor/laravel/framework/src/Illuminate/Session/Middleware.php', $basePath.'/vendor/laravel/framework/src/Illuminate/Session/Store.php', $basePath.'/vendor/laravel/framework/src/Illuminate/Session/SessionManager.php', @@ -104,6 +106,7 @@ $basePath.'/vendor/laravel/framework/src/Illuminate/View/Engines/EngineInterface.php', $basePath.'/vendor/laravel/framework/src/Illuminate/View/Engines/PhpEngine.php', $basePath.'/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Response.php', + $basePath.'/vendor/laravel/framework/src/Illuminate/Http/ResponseTrait.php', $basePath.'/vendor/laravel/framework/src/Illuminate/Http/Response.php', $basePath.'/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/ResponseHeaderBag.php', $basePath.'/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Cookie.php', diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/Console/RoutesCommand.php b/vendor/laravel/framework/src/Illuminate/Foundation/Console/RoutesCommand.php index 89580838d..2a28493eb 100755 --- a/vendor/laravel/framework/src/Illuminate/Foundation/Console/RoutesCommand.php +++ b/vendor/laravel/framework/src/Illuminate/Foundation/Console/RoutesCommand.php @@ -8,7 +8,7 @@ class RoutesCommand extends Command { - /** + /** * The console command name. * * @var string diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/Console/TailCommand.php b/vendor/laravel/framework/src/Illuminate/Foundation/Console/TailCommand.php index 607f68b5c..360c0efa0 100755 --- a/vendor/laravel/framework/src/Illuminate/Foundation/Console/TailCommand.php +++ b/vendor/laravel/framework/src/Illuminate/Foundation/Console/TailCommand.php @@ -71,7 +71,7 @@ protected function tailLocalLogs($path) $lines = $this->option('lines'); - with(new Process('tail -f -n '.$lines.' '.escapeshellarg($path)))->setTimeout(null)->run(function($type, $line) use ($output) + (new Process('tail -f -n '.$lines.' '.escapeshellarg($path)))->setTimeout(null)->run(function($type, $line) use ($output) { $output->write($line); }); diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/Console/TinkerCommand.php b/vendor/laravel/framework/src/Illuminate/Foundation/Console/TinkerCommand.php index af70ecea9..fe3fcdcb7 100755 --- a/vendor/laravel/framework/src/Illuminate/Foundation/Console/TinkerCommand.php +++ b/vendor/laravel/framework/src/Illuminate/Foundation/Console/TinkerCommand.php @@ -46,7 +46,7 @@ protected function runBorisShell() { $this->setupBorisErrorHandling(); - with(new \Boris\Boris('> '))->start(); + (new \Boris\Boris('> '))->start(); } /** diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/changes.json b/vendor/laravel/framework/src/Illuminate/Foundation/changes.json index 7272fa801..c8977e661 100755 --- a/vendor/laravel/framework/src/Illuminate/Foundation/changes.json +++ b/vendor/laravel/framework/src/Illuminate/Foundation/changes.json @@ -25,7 +25,8 @@ {"message": "Added --daemon option to the queue:work command.", "backport": null}, {"message": "Added convenient traits for authentication and password reminding.", "backport": null}, {"message": "Added 'reject' method to Collection.", "backport": null}, - {"message": "Added 'updateOrCreate' method to Eloquent model.", "backport": null} + {"message": "Added 'updateOrCreate' method to Eloquent model.", "backport": null}, + {"message": "Added 'keyBy' method to Collection.", "backport": null} ], "4.1.*": [ {"message": "Added new SSH task runner tools.", "backport": null}, diff --git a/vendor/laravel/framework/src/Illuminate/Mail/Transport/MailgunTransport.php b/vendor/laravel/framework/src/Illuminate/Mail/Transport/MailgunTransport.php index 58de4d075..2af36f66b 100755 --- a/vendor/laravel/framework/src/Illuminate/Mail/Transport/MailgunTransport.php +++ b/vendor/laravel/framework/src/Illuminate/Mail/Transport/MailgunTransport.php @@ -75,10 +75,10 @@ public function send(Swift_Mime_Message $message, &$failedRecipients = null) $client->post($this->url, ['auth' => ['api', $this->key], 'body' => [ - 'to' => $this->getTo($message), - 'message' => new PostFile('message', (string) $message), - ], - ]); + 'to' => $this->getTo($message), + 'message' => new PostFile('message', (string) $message), + ], + ]); } /** diff --git a/vendor/laravel/framework/src/Illuminate/Routing/Route.php b/vendor/laravel/framework/src/Illuminate/Routing/Route.php index 8115819e9..7c6b43af0 100755 --- a/vendor/laravel/framework/src/Illuminate/Routing/Route.php +++ b/vendor/laravel/framework/src/Illuminate/Routing/Route.php @@ -1,6 +1,5 @@ getResourceUri($name); + $action = $this->getResourceAction($name, $controller, 'index', $options); - return $this->get($this->getResourceUri($name), $action); + return $this->get($uri, $action); } /** @@ -544,9 +546,11 @@ protected function addResourceIndex($name, $base, $controller, $options) */ protected function addResourceCreate($name, $base, $controller, $options) { + $uri = $this->getResourceUri($name).'/create'; + $action = $this->getResourceAction($name, $controller, 'create', $options); - return $this->get($this->getResourceUri($name).'/create', $action); + return $this->get($uri, $action); } /** @@ -560,9 +564,11 @@ protected function addResourceCreate($name, $base, $controller, $options) */ protected function addResourceStore($name, $base, $controller, $options) { + $uri = $this->getResourceUri($name); + $action = $this->getResourceAction($name, $controller, 'store', $options); - return $this->post($this->getResourceUri($name), $action); + return $this->post($uri, $action); } /** @@ -578,7 +584,9 @@ protected function addResourceShow($name, $base, $controller, $options) { $uri = $this->getResourceUri($name).'/{'.$base.'}'; - return $this->get($uri, $this->getResourceAction($name, $controller, 'show', $options)); + $action = $this->getResourceAction($name, $controller, 'show', $options); + + return $this->get($uri, $action); } /** @@ -594,7 +602,9 @@ protected function addResourceEdit($name, $base, $controller, $options) { $uri = $this->getResourceUri($name).'/{'.$base.'}/edit'; - return $this->get($uri, $this->getResourceAction($name, $controller, 'edit', $options)); + $action = $this->getResourceAction($name, $controller, 'edit', $options); + + return $this->get($uri, $action); } /** @@ -626,7 +636,9 @@ protected function addPutResourceUpdate($name, $base, $controller, $options) { $uri = $this->getResourceUri($name).'/{'.$base.'}'; - return $this->put($uri, $this->getResourceAction($name, $controller, 'update', $options)); + $action = $this->getResourceAction($name, $controller, 'update', $options); + + return $this->put($uri, $action); } /** @@ -655,9 +667,11 @@ protected function addPatchResourceUpdate($name, $base, $controller) */ protected function addResourceDestroy($name, $base, $controller, $options) { + $uri = $this->getResourceUri($name).'/{'.$base.'}'; + $action = $this->getResourceAction($name, $controller, 'destroy', $options); - return $this->delete($this->getResourceUri($name).'/{'.$base.'}', $action); + return $this->delete($uri, $action); } /** diff --git a/vendor/laravel/framework/src/Illuminate/Session/SessionManager.php b/vendor/laravel/framework/src/Illuminate/Session/SessionManager.php index 513b33075..2a489bdbb 100755 --- a/vendor/laravel/framework/src/Illuminate/Session/SessionManager.php +++ b/vendor/laravel/framework/src/Illuminate/Session/SessionManager.php @@ -1,7 +1,6 @@ first($value)); + } + + return in_array($value, $this->items); + } + /** * Diff the collection with the given items. * @@ -384,7 +400,7 @@ public function put($key, $value) /** * Get one or more items randomly from the collection. * - * @param int $amount + * @param int $amount * @return mixed */ public function random($amount = 1) @@ -398,7 +414,7 @@ public function random($amount = 1) * Reduce the collection to a single value. * * @param callable $callback - * @param mixed $initial + * @param mixed $initial * @return mixed */ public function reduce($callback, $initial = null) @@ -482,7 +498,7 @@ public function slice($offset, $length = null, $preserveKeys = false) /** * Chunk the underlying collection array. * - * @param int $size + * @param int $size * @param bool $preserveKeys * @return \Illuminate\Support\Collection */ @@ -515,8 +531,8 @@ public function sort(Closure $callback) * Sort the collection using the given Closure. * * @param \Closure|string $callback - * @param int $options - * @param bool $descending + * @param int $options + * @param bool $descending * @return \Illuminate\Support\Collection */ public function sortBy($callback, $options = SORT_REGULAR, $descending = false) @@ -554,7 +570,7 @@ public function sortBy($callback, $options = SORT_REGULAR, $descending = false) * Sort the collection in descending order using the given Closure. * * @param \Closure|string $callback - * @param int $options + * @param int $options * @return \Illuminate\Support\Collection */ public function sortByDesc($callback, $options = SORT_REGULAR) @@ -579,7 +595,7 @@ public function splice($offset, $length = 0, $replacement = array()) * Get the sum of the given values. * * @param \Closure $callback - * @param string $callback + * @param string $callback * @return mixed */ public function sum($callback) @@ -706,6 +722,7 @@ public function getIterator() /** * Get a CachingIterator instance. * + * @param int $flags * @return \CachingIterator */ public function getCachingIterator($flags = CachingIterator::CALL_TOSTRING) diff --git a/vendor/laravel/framework/src/Illuminate/Validation/Validator.php b/vendor/laravel/framework/src/Illuminate/Validation/Validator.php index ea4f7a02e..6e8b1d8c4 100755 --- a/vendor/laravel/framework/src/Illuminate/Validation/Validator.php +++ b/vendor/laravel/framework/src/Illuminate/Validation/Validator.php @@ -696,19 +696,19 @@ protected function validateAccepted($attribute, $value) return ($this->validateRequired($attribute, $value) && in_array($value, $acceptable, true)); } - /** - * Validate that an attribute is a boolean. - * - * @param string $attribute - * @param mixed $value - * @return bool - */ - protected function validateBoolean($attribute, $value) - { - $acceptable = array(true, false, 0, 1, '0', '1'); + /** + * Validate that an attribute is a boolean. + * + * @param string $attribute + * @param mixed $value + * @return bool + */ + protected function validateBoolean($attribute, $value) + { + $acceptable = array(true, false, 0, 1, '0', '1'); - return in_array($value, $acceptable, true); - } + return in_array($value, $acceptable, true); + } /** * Validate that an attribute is an array. @@ -1283,8 +1283,13 @@ protected function validateBefore($attribute, $value, $parameters) */ protected function validateBeforeWithFormat($format, $value, $parameters) { - return DateTime::createFromFormat($format, $value) < - DateTime::createFromFormat($format, $parameters[0]); + $param = $this->getValue($parameters[0]) ?: $parameters[0]; + + $dateValue = DateTime::createFromFormat($format, $value); + + $dateParam = DateTime::createFromFormat($format, $param) ?: new DateTime($param); + + return ($dateValue && $dateParam) && ($dateValue < $dateParam); } /** @@ -1324,10 +1329,15 @@ protected function validateAfter($attribute, $value, $parameters) */ protected function validateAfterWithFormat($format, $value, $parameters) { - return DateTime::createFromFormat($format, $value) > - DateTime::createFromFormat($format, $parameters[0]); + $param = $this->getValue($parameters[0]) ?: $parameters[0]; + + $dateValue = DateTime::createFromFormat($format, $value); + + $dateParam = DateTime::createFromFormat($format, $param) ?: new DateTime($param); + + return ($dateValue && $dateParam) && ($dateValue > $dateParam); } - + /** * Validate that an attribute is a valid timezone. * @@ -1345,7 +1355,7 @@ protected function validateTimezone($attribute, $value) { return false; } - + return true; } diff --git a/vendor/laravel/framework/src/Illuminate/View/Compilers/BladeCompiler.php b/vendor/laravel/framework/src/Illuminate/View/Compilers/BladeCompiler.php index 31d89057b..bb99d1962 100755 --- a/vendor/laravel/framework/src/Illuminate/View/Compilers/BladeCompiler.php +++ b/vendor/laravel/framework/src/Illuminate/View/Compilers/BladeCompiler.php @@ -223,11 +223,13 @@ protected function compileStatements($value) */ protected function compileRegularEchos($value) { - $pattern = sprintf('/(@)?%s\s*(.+?)\s*%s/s', $this->contentTags[0], $this->contentTags[1]); + $pattern = sprintf('/(@)?%s\s*(.+?)\s*%s(\r?\n)?/s', $this->contentTags[0], $this->contentTags[1]); $callback = function($matches) { - return $matches[1] ? substr($matches[0], 1) : 'compileEchoDefaults($matches[2]).'; ?>'; + $whitespace = empty($matches[3]) ? '' : $matches[3].$matches[3]; + + return $matches[1] ? substr($matches[0], 1) : 'compileEchoDefaults($matches[2]).'; ?>'.$whitespace; }; return preg_replace_callback($pattern, $callback, $value); @@ -241,11 +243,13 @@ protected function compileRegularEchos($value) */ protected function compileEscapedEchos($value) { - $pattern = sprintf('/%s\s*(.+?)\s*%s/s', $this->escapedTags[0], $this->escapedTags[1]); + $pattern = sprintf('/%s\s*(.+?)\s*%s(\r?\n)?/s', $this->escapedTags[0], $this->escapedTags[1]); $callback = function($matches) { - return 'compileEchoDefaults($matches[1]).'); ?>'; + $whitespace = empty($matches[2]) ? '' : $matches[2].$matches[2]; + + return 'compileEchoDefaults($matches[1]).'); ?>'.$whitespace; }; return preg_replace_callback($pattern, $callback, $value); diff --git a/vendor/laravel/framework/src/Illuminate/View/FileViewFinder.php b/vendor/laravel/framework/src/Illuminate/View/FileViewFinder.php index 723ad9ace..e593f4ce6 100755 --- a/vendor/laravel/framework/src/Illuminate/View/FileViewFinder.php +++ b/vendor/laravel/framework/src/Illuminate/View/FileViewFinder.php @@ -227,7 +227,7 @@ public function addExtension($extension) } /** - * Returns whether or not the view specify a hint information + * Returns whether or not the view specify a hint information. * * @param string $name * @return boolean diff --git a/vendor/laravel/framework/src/Illuminate/Workbench/PackageCreator.php b/vendor/laravel/framework/src/Illuminate/Workbench/PackageCreator.php index 3716be977..ac7f100cb 100755 --- a/vendor/laravel/framework/src/Illuminate/Workbench/PackageCreator.php +++ b/vendor/laravel/framework/src/Illuminate/Workbench/PackageCreator.php @@ -72,8 +72,8 @@ public function create(Package $package, $path, $plain = true) /** * Create a package with all resource directories. * - * @param Package $package - * @param string $path + * @param \Illuminate\Workbench\Package $package + * @param string $path * @return void */ public function createWithResources(Package $package, $path) @@ -84,7 +84,7 @@ public function createWithResources(Package $package, $path) /** * Get the blocks for a given package. * - * @param bool $plain + * @param bool $plain * @return array */ protected function getBlocks($plain) @@ -97,6 +97,7 @@ protected function getBlocks($plain) * * @param \Illuminate\Workbench\Package $package * @param string $directory + * @param bool $plain * @return void */ public function writeSupportFiles(Package $package, $directory, $plain) @@ -140,6 +141,7 @@ protected function writeTravisFile(Package $package, $directory) * * @param \Illuminate\Workbench\Package $package * @param string $directory + * @param bool $plain * @return void */ protected function writeComposerFile(Package $package, $directory, $plain) @@ -154,7 +156,7 @@ protected function writeComposerFile(Package $package, $directory, $plain) /** * Get the Composer.json stub file contents. * - * @param bool $plain + * @param bool $plain * @return string */ protected function getComposerStub($plain) @@ -169,6 +171,7 @@ protected function getComposerStub($plain) * * @param \Illuminate\Workbench\Package $package * @param string $directory + * @param bool $plain * @return void */ public function writeIgnoreFile(Package $package, $directory, $plain) @@ -216,6 +219,7 @@ protected function writeSupportDirectory(Package $package, $support, $directory) * * @param \Illuminate\Workbench\Package $package * @param string $directory + * @param bool $plain * @return void */ public function writePublicDirectory(Package $package, $directory, $plain) @@ -246,6 +250,7 @@ public function writeTestDirectory(Package $package, $directory) * * @param \Illuminate\Workbench\Package $package * @param string $directory + * @param bool $plain * @return void */ public function writeServiceProvider(Package $package, $directory, $plain) @@ -282,7 +287,7 @@ protected function writeProviderStub(Package $package, $directory, $stub) * Get the stub for a ServiceProvider. * * @param \Illuminate\Workbench\Package $package - * @param bool $plain + * @param bool $plain * @return string */ protected function getProviderStub(Package $package, $plain) @@ -293,7 +298,7 @@ protected function getProviderStub(Package $package, $plain) /** * Load the raw service provider file. * - * @param bool $plain + * @param bool $plain * @return string */ protected function getProviderFile($plain) diff --git a/vendor/monolog/monolog/README.mdown b/vendor/monolog/monolog/README.mdown index fd28a473a..cdc8b29bb 100755 --- a/vendor/monolog/monolog/README.mdown +++ b/vendor/monolog/monolog/README.mdown @@ -120,6 +120,7 @@ Handlers - _PushoverHandler_: Sends mobile notifications via the [Pushover](https://www.pushover.net/) API. - _HipChatHandler_: Logs records to a [HipChat](http://hipchat.com) chat room using its API. - _FlowdockHandler_: Logs records to a [Flowdock](https://www.flowdock.com/) account. +- _SlackHandler_: Logs records to a [Slack](https://www.slack.com/) account. ### Log specific servers and networked logging diff --git a/vendor/monolog/monolog/composer.json b/vendor/monolog/monolog/composer.json index c94c302cd..57a1d91e9 100755 --- a/vendor/monolog/monolog/composer.json +++ b/vendor/monolog/monolog/composer.json @@ -37,6 +37,9 @@ "autoload": { "psr-4": {"Monolog\\": "src/Monolog"} }, + "provide": { + "psr/log-implementation": "1.0.0" + }, "extra": { "branch-alias": { "dev-master": "1.10.x-dev" diff --git a/vendor/monolog/monolog/src/Monolog/Formatter/LogglyFormatter.php b/vendor/monolog/monolog/src/Monolog/Formatter/LogglyFormatter.php index 5ef0d9fae..f02bceb0c 100755 --- a/vendor/monolog/monolog/src/Monolog/Formatter/LogglyFormatter.php +++ b/vendor/monolog/monolog/src/Monolog/Formatter/LogglyFormatter.php @@ -38,7 +38,7 @@ public function __construct($batchMode = self::BATCH_MODE_NEWLINES, $appendNewli public function format(array $record) { if (isset($record["datetime"]) && ($record["datetime"] instanceof \DateTime)) { - $record["timestamp"] = $record["datetime"]->format("c"); + $record["timestamp"] = $record["datetime"]->format("Y-m-d\TH:i:s.uO"); // TODO 2.0 unset the 'datetime' parameter, retained for BC } diff --git a/vendor/monolog/monolog/src/Monolog/Handler/LogglyHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/LogglyHandler.php index 9a3de6e60..efd94d300 100755 --- a/vendor/monolog/monolog/src/Monolog/Handler/LogglyHandler.php +++ b/vendor/monolog/monolog/src/Monolog/Handler/LogglyHandler.php @@ -46,6 +46,11 @@ public function setTag($tag) $this->tag = $tag; } + public function addTag($tag) + { + $this->tag = (strlen($this->tag) > 0) ? $this->tag .','. $tag : $tag; + } + protected function write(array $record) { $this->send($record["formatted"], self::ENDPOINT_SINGLE); diff --git a/vendor/monolog/monolog/src/Monolog/Handler/SlackHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/SlackHandler.php new file mode 100755 index 000000000..f38a69288 --- /dev/null +++ b/vendor/monolog/monolog/src/Monolog/Handler/SlackHandler.php @@ -0,0 +1,175 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Monolog\Handler; + +use Monolog\Logger; + +/** + * Sends notifications through Slack API + * + * @author Greg Kedzierski + * @see https://api.slack.com/ + */ +class SlackHandler extends SocketHandler +{ + /** + * Slack API token + * @var string + */ + private $token; + + /** + * Slack channel (encoded ID or name) + * @var string + */ + private $channel; + + /** + * Name of a bot + * @var string + */ + private $username; + + /** + * Whether the message should be added to Slack as attachment (plain text otherwise) + * @var bool + */ + private $useAttachment; + + /** + * @param string $token Slack API token + * @param string $channel Slack channel (encoded ID or name) + * @param string $username Name of a bot + * @param bool $useAttachment Whether the message should be added to Slack as attachment (plain text otherwise) + * @param int $level The minimum logging level at which this handler will be triggered + * @param bool $bubble Whether the messages that are handled can bubble up the stack or not + */ + public function __construct($token, $channel, $username = 'Monolog', $useAttachment = true, $level = Logger::CRITICAL, $bubble = true) + { + if (!extension_loaded('openssl')) { + throw new MissingExtensionException('The OpenSSL PHP extension is required to use the SlackHandler'); + } + + parent::__construct('ssl://slack.com:443', $level, $bubble); + + $this->token = $token; + $this->channel = $channel; + $this->username = $username; + $this->useAttachment = $useAttachment; + } + + /** + * {@inheritdoc} + * + * @param array $record + * @return string + */ + protected function generateDataStream($record) + { + $content = $this->buildContent($record); + + return $this->buildHeader($content) . $content; + } + + /** + * Builds the body of API call + * + * @param array $record + * @return string + */ + private function buildContent($record) + { + $dataArray = array( + 'token' => $this->token, + 'channel' => $this->channel, + 'username' => $this->username, + 'text' => '', + 'attachments' => array() + ); + + if ($this->useAttachment) { + $dataArray['attachments'] = json_encode( + array( + array( + 'fallback' => $record['message'], + 'color' => $this->getAttachmentColor($record['level']), + 'fields' => array( + array( + 'title' => 'Message', + 'value' => $record['message'], + 'short' => false + ), + array( + 'title' => 'Level', + 'value' => $record['level_name'], + 'short' => true + ) + ) + ) + ) + ); + } else { + $dataArray['text'] = $record['message']; + } + + return http_build_query($dataArray); + } + + /** + * Builds the header of the API Call + * + * @param string $content + * @return string + */ + private function buildHeader($content) + { + $header = "POST /api/chat.postMessage HTTP/1.1\r\n"; + $header .= "Host: slack.com\r\n"; + $header .= "Content-Type: application/x-www-form-urlencoded\r\n"; + $header .= "Content-Length: " . strlen($content) . "\r\n"; + $header .= "\r\n"; + + return $header; + } + + /** + * {@inheritdoc} + * + * @param array $record + */ + public function write(array $record) + { + parent::write($record); + $this->closeSocket(); + } + + /** + * Returned a Slack message attachment color associated with + * provided level. + * + * @param int $level + * @return string + */ + protected function getAttachmentColor($level) + { + switch (true) { + case $level >= Logger::ERROR: + return 'danger'; + case $level >= Logger::WARNING: + return 'warning'; + case $level >= Logger::INFO: + return 'good'; + default: + return '#e3e4e6'; + } + } +} diff --git a/vendor/monolog/monolog/tests/Monolog/Handler/SlackHandlerTest.php b/vendor/monolog/monolog/tests/Monolog/Handler/SlackHandlerTest.php new file mode 100755 index 000000000..943c466bf --- /dev/null +++ b/vendor/monolog/monolog/tests/Monolog/Handler/SlackHandlerTest.php @@ -0,0 +1,123 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Monolog\Handler; + +use Monolog\TestCase; +use Monolog\Logger; + +/** + * @author Greg Kedzierski + * @see https://api.slack.com/ + */ +class SlackHandlerTest extends TestCase +{ + /** + * @var resource + */ + private $res; + + /** + * @var SlackHandler + */ + private $handler; + + public function setUp() + { + if (!extension_loaded('openssl')) { + $this->markTestSkipped('This test requires openssl to run'); + } + } + + public function testWriteHeader() + { + $this->createHandler(); + $this->handler->handle($this->getRecord(Logger::CRITICAL, 'test1')); + fseek($this->res, 0); + $content = fread($this->res, 1024); + + $this->assertRegexp('/POST \/api\/chat.postMessage HTTP\/1.1\\r\\nHost: slack.com\\r\\nContent-Type: application\/x-www-form-urlencoded\\r\\nContent-Length: \d{2,4}\\r\\n\\r\\n/', $content); + } + + public function testWriteContent() + { + $this->createHandler(); + $this->handler->handle($this->getRecord(Logger::CRITICAL, 'test1')); + fseek($this->res, 0); + $content = fread($this->res, 1024); + + $this->assertRegexp('/token=myToken&channel=channel1&username=Monolog&text=&attachments=.*$/', $content); + } + + /** + * @dataProvider provideLevelColors + */ + public function testWriteContentWithColors($level, $expectedColor) + { + $this->createHandler(); + $this->handler->handle($this->getRecord($level, 'test1')); + fseek($this->res, 0); + $content = fread($this->res, 1024); + + $this->assertRegexp('/color%22%3A%22'.$expectedColor.'/', $content); + } + + public function testWriteContentWithPlainTextMessage() + { + $this->createHandler('myToken', 'channel1', 'Monolog', false); + $this->handler->handle($this->getRecord(Logger::CRITICAL, 'test1')); + fseek($this->res, 0); + $content = fread($this->res, 1024); + + $this->assertRegexp('/text=test1/', $content); + } + + public function provideLevelColors() + { + return array( + array(Logger::DEBUG, '%23e3e4e6'), // escaped #e3e4e6 + array(Logger::INFO, 'good'), + array(Logger::NOTICE, 'good'), + array(Logger::WARNING, 'warning'), + array(Logger::ERROR, 'danger'), + array(Logger::CRITICAL, 'danger'), + array(Logger::ALERT, 'danger'), + array(Logger::EMERGENCY,'danger'), + ); + } + + private function createHandler($token = 'myToken', $channel = 'channel1', $username = 'Monolog', $useAttachment = true) + { + $constructorArgs = array($token, $channel, $username, $useAttachment, Logger::DEBUG, true); + $this->res = fopen('php://memory', 'a'); + $this->handler = $this->getMock( + '\Monolog\Handler\SlackHandler', + array('fsockopen', 'streamSetTimeout', 'closeSocket'), + $constructorArgs + ); + + $reflectionProperty = new \ReflectionProperty('\Monolog\Handler\SocketHandler', 'connectionString'); + $reflectionProperty->setAccessible(true); + $reflectionProperty->setValue($this->handler, 'localhost:1234'); + + $this->handler->expects($this->any()) + ->method('fsockopen') + ->will($this->returnValue($this->res)); + $this->handler->expects($this->any()) + ->method('streamSetTimeout') + ->will($this->returnValue(true)); + $this->handler->expects($this->any()) + ->method('closeSocket') + ->will($this->returnValue(true)); + + $this->handler->setFormatter($this->getIdentityFormatter()); + } +} diff --git a/vendor/phpseclib/phpseclib/README.md b/vendor/phpseclib/phpseclib/README.md index 3edd16aa0..ce518e647 100755 --- a/vendor/phpseclib/phpseclib/README.md +++ b/vendor/phpseclib/phpseclib/README.md @@ -6,7 +6,7 @@ MIT-licensed pure-PHP implementations of an arbitrary-precision integer arithmetic library, fully PKCS#1 (v2.1) compliant RSA, DES, 3DES, RC4, Rijndael, AES, Blowfish, Twofish, SSH-1, SSH-2, SFTP, and X.509 -* [Download (0.3.6)](http://sourceforge.net/projects/phpseclib/files/phpseclib0.3.6.zip/download) +* [Download (0.3.7)](http://sourceforge.net/projects/phpseclib/files/phpseclib0.3.7.zip/download) * [Browse Git](https://github.com/phpseclib/phpseclib) * [Documentation](http://phpseclib.sourceforge.net/) * [Support](http://www.frostjedi.com/phpbb/viewforum.php?f=46) diff --git a/vendor/phpseclib/phpseclib/phpseclib/Net/SCP.php b/vendor/phpseclib/phpseclib/phpseclib/Net/SCP.php index 2796a3555..8fae6e6df 100755 --- a/vendor/phpseclib/phpseclib/phpseclib/Net/SCP.php +++ b/vendor/phpseclib/phpseclib/phpseclib/Net/SCP.php @@ -170,7 +170,7 @@ function put($remote_file, $data, $mode = NET_SCP_STRING, $callback = null) return false; } - if (!$this->ssh->exec('scp -t ' . $remote_file, false)) { // -t = to + if (!$this->ssh->exec('scp -t "' . $remote_file . '"', false)) { // -t = to return false; } @@ -245,7 +245,7 @@ function get($remote_file, $local_file = false) return false; } - if (!$this->ssh->exec('scp -f ' . $remote_file, false)) { // -f = from + if (!$this->ssh->exec('scp -f "' . $remote_file . '"', false)) { // -f = from return false; } diff --git a/vendor/predis/predis/CHANGELOG.md b/vendor/predis/predis/CHANGELOG.md index ee9de1628..41e3abd43 100755 --- a/vendor/predis/predis/CHANGELOG.md +++ b/vendor/predis/predis/CHANGELOG.md @@ -22,6 +22,9 @@ v0.8.6 (2014-xx-xx) - __FIX__: fix parsing of the output of `CLUSTER NODES` to fetch the slots map from a node when redis-cluster has slaves in its configuration (ISSUE #165). +- __FIX__: prevent stack overflows when using the abstraction for cursor-based + iterators over large collections (ISSUE #182). + - Upgraded to PHPUnit 4.* for the test suite. diff --git a/vendor/predis/predis/lib/Predis/Collection/Iterator/CursorBasedIterator.php b/vendor/predis/predis/lib/Predis/Collection/Iterator/CursorBasedIterator.php index 787cd17eb..d9f019e89 100755 --- a/vendor/predis/predis/lib/Predis/Collection/Iterator/CursorBasedIterator.php +++ b/vendor/predis/predis/lib/Predis/Collection/Iterator/CursorBasedIterator.php @@ -166,16 +166,18 @@ public function key() */ public function next() { - if (!$this->elements && $this->fetchmore) { - $this->fetch(); - } - - if ($this->elements) { - $this->extractNext(); - } elseif ($this->cursor) { - $this->next(); - } else { - $this->valid = false; + tryFetch: { + if (!$this->elements && $this->fetchmore) { + $this->fetch(); + } + + if ($this->elements) { + $this->extractNext(); + } elseif ($this->cursor) { + goto tryFetch; + } else { + $this->valid = false; + } } } diff --git a/vendor/predis/predis/lib/Predis/Connection/StreamConnection.php b/vendor/predis/predis/lib/Predis/Connection/StreamConnection.php index 79d0101a8..f547f24ee 100755 --- a/vendor/predis/predis/lib/Predis/Connection/StreamConnection.php +++ b/vendor/predis/predis/lib/Predis/Connection/StreamConnection.php @@ -183,7 +183,7 @@ protected function writeBytes($buffer) $socket = $this->getResource(); while (($length = strlen($buffer)) > 0) { - $written = fwrite($socket, $buffer); + $written = @fwrite($socket, $buffer); if ($length === $written) { return; diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift.php index 1d1f8215e..77145fdcb 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift.php @@ -11,7 +11,6 @@ /** * General utility class in Swift Mailer, not to be instantiated. * - * @package Swift * * @author Chris Corbyn */ diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Attachment.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Attachment.php index 7fdbcb999..32759e0d8 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Attachment.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Attachment.php @@ -11,8 +11,6 @@ /** * Attachment class for attaching files to a {@link Swift_Mime_Message}. * - * @package Swift - * @subpackage Mime * @author Chris Corbyn */ class Swift_Attachment extends Swift_Mime_Attachment diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/ByteStream/AbstractFilterableInputStream.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/ByteStream/AbstractFilterableInputStream.php index e12c0dd5d..3e597d17c 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/ByteStream/AbstractFilterableInputStream.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/ByteStream/AbstractFilterableInputStream.php @@ -11,8 +11,6 @@ /** * Provides the base functionality for an InputStream supporting filters. * - * @package Swift - * @subpackage ByteStream * @author Chris Corbyn */ abstract class Swift_ByteStream_AbstractFilterableInputStream implements Swift_InputByteStream, Swift_Filterable @@ -157,8 +155,6 @@ public function flushBuffers() } } - // -- Private methods - /** Run $bytes through all filters */ private function _filter($bytes) { diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/ByteStream/ArrayByteStream.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/ByteStream/ArrayByteStream.php index aa2959736..043a51795 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/ByteStream/ArrayByteStream.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/ByteStream/ArrayByteStream.php @@ -11,8 +11,6 @@ /** * Allows reading and writing of bytes to and from an array. * - * @package Swift - * @subpackage ByteStream * @author Chris Corbyn */ class Swift_ByteStream_ArrayByteStream implements Swift_InputByteStream, Swift_OutputByteStream diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/ByteStream/FileByteStream.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/ByteStream/FileByteStream.php index 6f1d87e0f..9f3218f78 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/ByteStream/FileByteStream.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/ByteStream/FileByteStream.php @@ -11,8 +11,6 @@ /** * Allows reading and writing of bytes to and from a file. * - * @package Swift - * @subpackage ByteStream * @author Chris Corbyn */ class Swift_ByteStream_FileByteStream extends Swift_ByteStream_AbstractFilterableInputStream implements Swift_FileStream @@ -93,13 +91,13 @@ public function read($length) ini_set('magic_quotes_runtime', 1); } $this->_offset = ftell($fp); - + // If we read one byte after reaching the end of the file // feof() will return false and an empty string is returned if ($bytes === '' && feof($fp)) { - $this->_resetReadHandle(); - - return false; + $this->_resetReadHandle(); + + return false; } return $bytes; @@ -125,8 +123,6 @@ public function setReadPointer($byteOffset) $this->_offset = $byteOffset; } - // -- Private methods - /** Just write the bytes to the file */ protected function _commit($bytes) { diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/ByteStream/TemporaryFileByteStream.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/ByteStream/TemporaryFileByteStream.php index f35f885e3..eb33151bb 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/ByteStream/TemporaryFileByteStream.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/ByteStream/TemporaryFileByteStream.php @@ -9,8 +9,6 @@ */ /** - * @package Swift - * @subpackage ByteStream * @author Romain-Geissler */ class Swift_ByteStream_TemporaryFileByteStream extends Swift_ByteStream_FileByteStream diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReader.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReader.php index 91a9c9680..febd77eb5 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReader.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReader.php @@ -11,8 +11,6 @@ /** * Analyzes characters for a specific character set. * - * @package Swift - * @subpackage Encoder * @author Chris Corbyn * @author Xavier De Cock */ diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReader/GenericFixedWidthReader.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReader/GenericFixedWidthReader.php index 654761205..d0c8698df 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReader/GenericFixedWidthReader.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReader/GenericFixedWidthReader.php @@ -11,8 +11,6 @@ /** * Provides fixed-width byte sizes for reading fixed-width character sets. * - * @package Swift - * @subpackage Encoder * @author Chris Corbyn * @author Xavier De Cock */ diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReader/UsAsciiReader.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReader/UsAsciiReader.php index 8d03f316d..a06ffe0a6 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReader/UsAsciiReader.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReader/UsAsciiReader.php @@ -11,8 +11,6 @@ /** * Analyzes US-ASCII characters. * - * @package Swift - * @subpackage Encoder * @author Chris Corbyn */ class Swift_CharacterReader_UsAsciiReader implements Swift_CharacterReader diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReader/Utf8Reader.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReader/Utf8Reader.php index 900bad557..79c6f729c 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReader/Utf8Reader.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReader/Utf8Reader.php @@ -11,8 +11,6 @@ /** * Analyzes UTF-8 characters. * - * @package Swift - * @subpackage Encoder * @author Chris Corbyn * @author Xavier De Cock */ diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReaderFactory.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReaderFactory.php index d653b8131..5bf38b8bf 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReaderFactory.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReaderFactory.php @@ -11,8 +11,6 @@ /** * A factory for creating CharacterReaders. * - * @package Swift - * @subpackage Encoder * @author Chris Corbyn */ interface Swift_CharacterReaderFactory diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReaderFactory/SimpleCharacterReaderFactory.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReaderFactory/SimpleCharacterReaderFactory.php index d74b2c539..a10daf98e 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReaderFactory/SimpleCharacterReaderFactory.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReaderFactory/SimpleCharacterReaderFactory.php @@ -11,8 +11,6 @@ /** * Standard factory for creating CharacterReaders. * - * @package Swift - * @subpackage Encoder * @author Chris Corbyn */ class Swift_CharacterReaderFactory_SimpleCharacterReaderFactory implements Swift_CharacterReaderFactory diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterStream.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterStream.php index a0f0721c2..aa46779e7 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterStream.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterStream.php @@ -15,8 +15,6 @@ * Classes implementing this interface may use a subsystem which requires less * memory than working with large strings of data. * - * @package Swift - * @subpackage CharacterStream * @author Chris Corbyn */ interface Swift_CharacterStream diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterStream/ArrayCharacterStream.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterStream/ArrayCharacterStream.php index 17f32c0cf..c53781356 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterStream/ArrayCharacterStream.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterStream/ArrayCharacterStream.php @@ -11,8 +11,6 @@ /** * A CharacterStream implementation which stores characters in an internal array. * - * @package Swift - * @subpackage CharacterStream * @author Chris Corbyn */ class Swift_CharacterStream_ArrayCharacterStream implements Swift_CharacterStream diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterStream/NgCharacterStream.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterStream/NgCharacterStream.php index d43c4e0ca..bd44658d7 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterStream/NgCharacterStream.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterStream/NgCharacterStream.php @@ -11,8 +11,6 @@ /** * A CharacterStream implementation which stores characters in an internal array. * - * @package Swift - * @subpackage CharacterStream * @author Xavier De Cock */ diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/ConfigurableSpool.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/ConfigurableSpool.php index 11179f8da..df87527f6 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/ConfigurableSpool.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/ConfigurableSpool.php @@ -11,7 +11,6 @@ /** * Base class for Spools (implements time and message limits). * - * @package Swift * @author Fabien Potencier */ abstract class Swift_ConfigurableSpool implements Swift_Spool diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/DependencyContainer.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/DependencyContainer.php index 2f9a77432..adcd27edd 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/DependencyContainer.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/DependencyContainer.php @@ -11,7 +11,6 @@ /** * Dependency Injection container. * - * @package Swift * @author Chris Corbyn */ class Swift_DependencyContainer @@ -289,8 +288,6 @@ public function addConstructorLookup($lookup) return $this; } - // -- Private methods - /** Get the literal value with $itemName */ private function _getValue($itemName) { diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/DependencyException.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/DependencyException.php index b3f017094..0a96232e9 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/DependencyException.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/DependencyException.php @@ -11,7 +11,6 @@ /** * DependencyException gets thrown when a requested dependency is missing. * - * @package Swift * @author Chris Corbyn */ class Swift_DependencyException extends Swift_SwiftException diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/EmbeddedFile.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/EmbeddedFile.php index a39a3478a..486ad6083 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/EmbeddedFile.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/EmbeddedFile.php @@ -11,8 +11,6 @@ /** * An embedded file, in a multipart message. * - * @package Swift - * @subpackage Mime * @author Chris Corbyn */ class Swift_EmbeddedFile extends Swift_Mime_EmbeddedFile diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Encoder.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Encoder.php index 2ad62e6cb..7c6564245 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Encoder.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Encoder.php @@ -10,8 +10,6 @@ /** * Interface for all Encoder schemes. - * @package Swift - * @subpackage Encoder * @author Chris Corbyn */ interface Swift_Encoder extends Swift_Mime_CharsetObserver diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Encoder/Base64Encoder.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Encoder/Base64Encoder.php index 63e473136..1da107ae4 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Encoder/Base64Encoder.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Encoder/Base64Encoder.php @@ -11,8 +11,6 @@ /** * Handles Base 64 Encoding in Swift Mailer. * - * @package Swift - * @subpackage Encoder * @author Chris Corbyn */ class Swift_Encoder_Base64Encoder implements Swift_Encoder diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Encoder/QpEncoder.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Encoder/QpEncoder.php index 3c362ed57..e8fc493db 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Encoder/QpEncoder.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Encoder/QpEncoder.php @@ -13,8 +13,6 @@ * * Possibly the most accurate RFC 2045 QP implementation found in PHP. * - * @package Swift - * @subpackage Encoder * @author Chris Corbyn */ class Swift_Encoder_QpEncoder implements Swift_Encoder @@ -224,8 +222,6 @@ public function charsetChanged($charset) $this->_charStream->setCharacterSet($charset); } - // -- Protected methods - /** * Encode the given byte array into a verbatim QP form. * diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Encoder/Rfc2231Encoder.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Encoder/Rfc2231Encoder.php index aa914a89d..c03fcc5fe 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Encoder/Rfc2231Encoder.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Encoder/Rfc2231Encoder.php @@ -11,8 +11,6 @@ /** * Handles RFC 2231 specified Encoding in Swift Mailer. * - * @package Swift - * @subpackage Encoder * @author Chris Corbyn */ class Swift_Encoder_Rfc2231Encoder implements Swift_Encoder diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Encoding.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Encoding.php index 96391949c..5cbb20fcd 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Encoding.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Encoding.php @@ -11,8 +11,6 @@ /** * Provides quick access to each encoding type. * - * @package Swift - * @subpackage Encoder * @author Chris Corbyn */ class Swift_Encoding diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/CommandEvent.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/CommandEvent.php index fa4f44470..670f4d3d8 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/CommandEvent.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/CommandEvent.php @@ -11,8 +11,6 @@ /** * Generated when a command is sent over an SMTP connection. * - * @package Swift - * @subpackage Events * @author Chris Corbyn */ class Swift_Events_CommandEvent extends Swift_Events_EventObject diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/CommandListener.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/CommandListener.php index 68009047f..3465c8d68 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/CommandListener.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/CommandListener.php @@ -11,8 +11,6 @@ /** * Listens for Transports to send commands to the server. * - * @package Swift - * @subpackage Events * @author Chris Corbyn */ interface Swift_Events_CommandListener extends Swift_Events_EventListener diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/Event.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/Event.php index c93bd9936..ffd9bed1b 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/Event.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/Event.php @@ -11,8 +11,6 @@ /** * The minimum interface for an Event. * - * @package Swift - * @subpackage Events * @author Chris Corbyn */ interface Swift_Events_Event diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/EventDispatcher.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/EventDispatcher.php index 59aeac855..c62c5e429 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/EventDispatcher.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/EventDispatcher.php @@ -11,8 +11,6 @@ /** * Interface for the EventDispatcher which handles the event dispatching layer. * - * @package Swift - * @subpackage Events * @author Chris Corbyn */ interface Swift_Events_EventDispatcher diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/EventListener.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/EventListener.php index bb2133145..751ec678c 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/EventListener.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/EventListener.php @@ -11,8 +11,6 @@ /** * An identity interface which all EventListeners must extend. * - * @package Swift - * @subpackage Events * @author Chris Corbyn */ interface Swift_Events_EventListener diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/EventObject.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/EventObject.php index 30526ce2d..50b6be6a8 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/EventObject.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/EventObject.php @@ -11,8 +11,6 @@ /** * A base Event which all Event classes inherit from. * - * @package Swift - * @subpackage Events * @author Chris Corbyn */ class Swift_Events_EventObject implements Swift_Events_Event diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/ResponseEvent.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/ResponseEvent.php index 6d7eb2710..6ca9b99aa 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/ResponseEvent.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/ResponseEvent.php @@ -11,8 +11,6 @@ /** * Generated when a response is received on a SMTP connection. * - * @package Swift - * @subpackage Events * @author Chris Corbyn */ class Swift_Events_ResponseEvent extends Swift_Events_EventObject diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/ResponseListener.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/ResponseListener.php index a39ba435c..9629f1e5b 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/ResponseListener.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/ResponseListener.php @@ -11,8 +11,6 @@ /** * Listens for responses from a remote SMTP server. * - * @package Swift - * @subpackage Events * @author Chris Corbyn */ interface Swift_Events_ResponseListener extends Swift_Events_EventListener diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/SendEvent.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/SendEvent.php index 0e055405d..0d3b4141b 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/SendEvent.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/SendEvent.php @@ -11,8 +11,6 @@ /** * Generated when a message is being sent. * - * @package Swift - * @subpackage Events * @author Chris Corbyn */ class Swift_Events_SendEvent extends Swift_Events_EventObject diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/SendListener.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/SendListener.php index bc914f542..7d35f18e0 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/SendListener.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/SendListener.php @@ -11,8 +11,6 @@ /** * Listens for Messages being sent from within the Transport system. * - * @package Swift - * @subpackage Events * @author Chris Corbyn */ interface Swift_Events_SendListener extends Swift_Events_EventListener diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/SimpleEventDispatcher.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/SimpleEventDispatcher.php index b869481ef..b7f82aedd 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/SimpleEventDispatcher.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/SimpleEventDispatcher.php @@ -11,8 +11,6 @@ /** * The EventDispatcher which handles the event dispatching layer. * - * @package Swift - * @subpackage Events * @author Chris Corbyn */ class Swift_Events_SimpleEventDispatcher implements Swift_Events_EventDispatcher @@ -134,8 +132,6 @@ public function dispatchEvent(Swift_Events_EventObject $evt, $target) $this->_bubble($evt, $target); } - // -- Private methods - /** Queue listeners on a stack ready for $evt to be bubbled up it */ private function _prepareBubbleQueue(Swift_Events_EventObject $evt) { diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/TransportChangeEvent.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/TransportChangeEvent.php index d8b5316bf..23c829702 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/TransportChangeEvent.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/TransportChangeEvent.php @@ -11,8 +11,6 @@ /** * Generated when the state of a Transport is changed (i.e. stopped/started). * - * @package Swift - * @subpackage Events * @author Chris Corbyn */ class Swift_Events_TransportChangeEvent extends Swift_Events_EventObject diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/TransportChangeListener.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/TransportChangeListener.php index 15550370e..0edfe377b 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/TransportChangeListener.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/TransportChangeListener.php @@ -11,8 +11,6 @@ /** * Listens for changes within the Transport system. * - * @package Swift - * @subpackage Events * @author Chris Corbyn */ interface Swift_Events_TransportChangeListener extends Swift_Events_EventListener diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/TransportExceptionEvent.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/TransportExceptionEvent.php index 88cf4746d..b2c72ca18 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/TransportExceptionEvent.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/TransportExceptionEvent.php @@ -11,8 +11,6 @@ /** * Generated when a TransportException is thrown from the Transport system. * - * @package Swift - * @subpackage Events * @author Chris Corbyn */ class Swift_Events_TransportExceptionEvent extends Swift_Events_EventObject diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/TransportExceptionListener.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/TransportExceptionListener.php index 709abda33..f153742cf 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/TransportExceptionListener.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/TransportExceptionListener.php @@ -11,8 +11,6 @@ /** * Listens for Exceptions thrown from within the Transport system. * - * @package Swift - * @subpackage Events * @author Chris Corbyn */ interface Swift_Events_TransportExceptionListener extends Swift_Events_EventListener diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/FailoverTransport.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/FailoverTransport.php index 22a82c690..6fa5fc70f 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/FailoverTransport.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/FailoverTransport.php @@ -11,8 +11,6 @@ /** * Contains a list of redundant Transports so when one fails, the next is used. * - * @package Swift - * @subpackage Transport * @author Chris Corbyn */ class Swift_FailoverTransport extends Swift_Transport_FailoverTransport diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/FileSpool.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/FileSpool.php index c2f8d7cff..89bc13d31 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/FileSpool.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/FileSpool.php @@ -11,7 +11,6 @@ /** * Stores Messages on the filesystem. * - * @package Swift * @author Fabien Potencier * @author Xavier De Cock */ diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/FileStream.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/FileStream.php index 567633ecd..802cb4305 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/FileStream.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/FileStream.php @@ -11,8 +11,6 @@ /** * An OutputByteStream which specifically reads from a file. * - * @package Swift - * @subpackage ByteStream * @author Chris Corbyn */ interface Swift_FileStream extends Swift_OutputByteStream diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Filterable.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Filterable.php index 64ad3b56c..1f664de8f 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Filterable.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Filterable.php @@ -11,7 +11,6 @@ /** * Allows StreamFilters to operate on a stream. * - * @package Swift * @author Chris Corbyn */ interface Swift_Filterable diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Image.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Image.php index ccc485ddd..966bee72f 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Image.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Image.php @@ -11,8 +11,6 @@ /** * An image, embedded in a multipart message. * - * @package Swift - * @subpackage Mime * @author Chris Corbyn */ class Swift_Image extends Swift_EmbeddedFile diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/InputByteStream.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/InputByteStream.php index 3506aca2e..fd45ab93b 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/InputByteStream.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/InputByteStream.php @@ -14,8 +14,6 @@ * Classes implementing this interface may use a subsystem which requires less * memory than working with large strings of data. * - * @package Swift - * @subpackage ByteStream * @author Chris Corbyn */ interface Swift_InputByteStream diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/IoException.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/IoException.php index dca105743..75698f9a2 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/IoException.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/IoException.php @@ -11,7 +11,6 @@ /** * I/O Exception class. * - * @package Swift * @author Chris Corbyn */ class Swift_IoException extends Swift_SwiftException diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache.php index 606f55ee7..a16a90bd6 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache.php @@ -11,8 +11,6 @@ /** * Provides a mechanism for storing data using two keys. * - * @package Swift - * @subpackage KeyCache * @author Chris Corbyn */ interface Swift_KeyCache diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache/ArrayKeyCache.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache/ArrayKeyCache.php index 8ef3dcc99..7a74af07a 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache/ArrayKeyCache.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache/ArrayKeyCache.php @@ -11,8 +11,6 @@ /** * A basic KeyCache backed by an array. * - * @package Swift - * @subpackage KeyCache * @author Chris Corbyn */ class Swift_KeyCache_ArrayKeyCache implements Swift_KeyCache @@ -194,8 +192,6 @@ public function clearAll($nsKey) unset($this->_contents[$nsKey]); } - // -- Private methods - /** * Initialize the namespace of $nsKey if needed. * diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache/DiskKeyCache.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache/DiskKeyCache.php index abd8611f2..73f434c4e 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache/DiskKeyCache.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache/DiskKeyCache.php @@ -11,8 +11,6 @@ /** * A KeyCache which streams to and from disk. * - * @package Swift - * @subpackage KeyCache * @author Chris Corbyn */ class Swift_KeyCache_DiskKeyCache implements Swift_KeyCache @@ -263,8 +261,6 @@ public function clearAll($nsKey) } } - // -- Private methods - /** * Initialize the namespace of $nsKey if needed. * diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache/KeyCacheInputStream.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache/KeyCacheInputStream.php index f4f8adb96..76039d8a1 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache/KeyCacheInputStream.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache/KeyCacheInputStream.php @@ -11,8 +11,6 @@ /** * Writes data to a KeyCache using a stream. * - * @package Swift - * @subpackage KeyCache * @author Chris Corbyn */ interface Swift_KeyCache_KeyCacheInputStream extends Swift_InputByteStream diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache/NullKeyCache.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache/NullKeyCache.php index 5c4e2cfd6..79ab89fc6 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache/NullKeyCache.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache/NullKeyCache.php @@ -11,8 +11,6 @@ /** * A null KeyCache that does not cache at all. * - * @package Swift - * @subpackage KeyCache * @author Chris Corbyn */ class Swift_KeyCache_NullKeyCache implements Swift_KeyCache diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache/SimpleKeyCacheInputStream.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache/SimpleKeyCacheInputStream.php index aa7de04a7..e829c8fdb 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache/SimpleKeyCacheInputStream.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache/SimpleKeyCacheInputStream.php @@ -11,8 +11,6 @@ /** * Writes data to a KeyCache using a stream. * - * @package Swift - * @subpackage KeyCache * @author Chris Corbyn */ class Swift_KeyCache_SimpleKeyCacheInputStream implements Swift_KeyCache_KeyCacheInputStream diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/LoadBalancedTransport.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/LoadBalancedTransport.php index 6eb3db706..6e1080b9f 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/LoadBalancedTransport.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/LoadBalancedTransport.php @@ -11,8 +11,6 @@ /** * Redundantly and rotationally uses several Transport implementations when sending. * - * @package Swift - * @subpackage Transport * @author Chris Corbyn */ class Swift_LoadBalancedTransport extends Swift_Transport_LoadBalancedTransport diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/MailTransport.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/MailTransport.php index 6c5793967..a6d3340d8 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/MailTransport.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/MailTransport.php @@ -11,8 +11,6 @@ /** * Sends Messages using the mail() function. * - * @package Swift - * @subpackage Transport * @author Chris Corbyn */ class Swift_MailTransport extends Swift_Transport_MailTransport diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mailer.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mailer.php index f4e051232..5677fcb4f 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mailer.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mailer.php @@ -11,7 +11,6 @@ /** * Swift Mailer class. * - * @package Swift * @author Chris Corbyn */ class Swift_Mailer diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mailer/ArrayRecipientIterator.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mailer/ArrayRecipientIterator.php index 1dd32415b..d02e1846b 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mailer/ArrayRecipientIterator.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mailer/ArrayRecipientIterator.php @@ -11,8 +11,6 @@ /** * Wraps a standard PHP array in an iterator. * - * @package Swift - * @subpackage Mailer * @author Chris Corbyn */ class Swift_Mailer_ArrayRecipientIterator implements Swift_Mailer_RecipientIterator diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mailer/RecipientIterator.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mailer/RecipientIterator.php index 8f109fa95..a935c563f 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mailer/RecipientIterator.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mailer/RecipientIterator.php @@ -11,8 +11,6 @@ /** * Provides an abstract way of specifying recipients for batch sending. * - * @package Swift - * @subpackage Mailer * @author Chris Corbyn */ interface Swift_Mailer_RecipientIterator diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/MemorySpool.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/MemorySpool.php index 6e042cd6a..fb705efcb 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/MemorySpool.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/MemorySpool.php @@ -11,7 +11,6 @@ /** * Stores Messages in memory. * - * @package Swift * @author Fabien Potencier */ class Swift_MemorySpool implements Swift_Spool diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Message.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Message.php index a5aac9eaa..7b25cf031 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Message.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Message.php @@ -11,8 +11,6 @@ /** * The Message class for building emails. * - * @package Swift - * @subpackage Mime * @author Chris Corbyn */ class Swift_Message extends Swift_Mime_SimpleMessage @@ -32,7 +30,7 @@ class Swift_Message extends Swift_Mime_SimpleMessage */ private $savedMessage = array(); - /** + /** * Create a new Message. * * Details may be optionally passed into the constructor. @@ -92,7 +90,7 @@ public function addPart($body, $contentType = null, $charset = null) $body, $contentType, $charset )); } - + /** * Attach a new signature handler to the message. * @@ -106,7 +104,7 @@ public function attachSigner(Swift_Signer $signer) } elseif ($signer instanceof Swift_Signers_BodySigner) { $this->bodySigners[] = $signer; } - + return $this; } @@ -122,6 +120,7 @@ public function detachSigner(Swift_Signer $signer) foreach ($this->headerSigners as $k => $headerSigner) { if ($headerSigner === $signer) { unset($this->headerSigners[$k]); + return $this; } } @@ -129,14 +128,15 @@ public function detachSigner(Swift_Signer $signer) foreach ($this->bodySigners as $k => $bodySigner) { if ($bodySigner === $signer) { unset($this->bodySigners[$k]); + return $this; } } - } - - return $this; + } + + return $this; } - + /** * Get this message as a complete string. * @@ -144,21 +144,21 @@ public function detachSigner(Swift_Signer $signer) */ public function toString() { - if (empty($this->headerSigners) && empty($this->bodySigners)) { - return parent::toString(); - } - + if (empty($this->headerSigners) && empty($this->bodySigners)) { + return parent::toString(); + } + $this->saveMessage(); - + $this->doSign(); - + $string = parent::toString(); - + $this->restoreMessage(); - - return $string; + + return $string; } - + /** * Write this message to a {@link Swift_InputByteStream}. * @@ -168,106 +168,105 @@ public function toByteStream(Swift_InputByteStream $is) { if (empty($this->headerSigners) && empty($this->bodySigners)) { parent::toByteStream($is); + return; } - + $this->saveMessage(); - + $this->doSign(); - + parent::toByteStream($is); - + $this->restoreMessage(); - + } - + public function __wakeup() { Swift_DependencyContainer::getInstance()->createDependenciesFor('mime.message'); } - - /* -- Protected Methods -- */ - + /** * loops through signers and apply the signatures */ protected function doSign() { - foreach ($this->bodySigners as $signer) { - $altered = $signer->getAlteredHeaders(); - $this->saveHeaders($altered); - $signer->signMessage($this); - } - - foreach ($this->headerSigners as $signer) { - $altered = $signer->getAlteredHeaders(); - $this->saveHeaders($altered); - $signer->reset(); - - $signer->setHeaders($this->getHeaders()); - - $signer->startBody(); - $this->_bodyToByteStream($signer); - $signer->endBody(); - - $signer->addSignature($this->getHeaders()); - } + foreach ($this->bodySigners as $signer) { + $altered = $signer->getAlteredHeaders(); + $this->saveHeaders($altered); + $signer->signMessage($this); + } + + foreach ($this->headerSigners as $signer) { + $altered = $signer->getAlteredHeaders(); + $this->saveHeaders($altered); + $signer->reset(); + + $signer->setHeaders($this->getHeaders()); + + $signer->startBody(); + $this->_bodyToByteStream($signer); + $signer->endBody(); + + $signer->addSignature($this->getHeaders()); + } } - + /** * save the message before any signature is applied */ protected function saveMessage() { - $this->savedMessage = array('headers'=> array()); - $this->savedMessage['body'] = $this->getBody(); - $this->savedMessage['children'] = $this->getChildren(); - if (count($this->savedMessage['children']) > 0 && $this->getBody() != '') { - $this->setChildren(array_merge(array($this->_becomeMimePart()), $this->savedMessage['children'])); - $this->setBody(''); - } + $this->savedMessage = array('headers'=> array()); + $this->savedMessage['body'] = $this->getBody(); + $this->savedMessage['children'] = $this->getChildren(); + if (count($this->savedMessage['children']) > 0 && $this->getBody() != '') { + $this->setChildren(array_merge(array($this->_becomeMimePart()), $this->savedMessage['children'])); + $this->setBody(''); + } } - + /** * save the original headers * @param array $altered */ protected function saveHeaders(array $altered) { - foreach ($altered as $head) { - $lc = strtolower($head); - - if (!isset($this->savedMessage['headers'][$lc])) { - $this->savedMessage['headers'][$lc] = $this->getHeaders()->getAll($head); - } - } + foreach ($altered as $head) { + $lc = strtolower($head); + + if (!isset($this->savedMessage['headers'][$lc])) { + $this->savedMessage['headers'][$lc] = $this->getHeaders()->getAll($head); + } + } } - + /** * Remove or restore altered headers */ protected function restoreHeaders() { - foreach ($this->savedMessage['headers'] as $name => $savedValue) { - $headers = $this->getHeaders()->getAll($name); - - foreach ($headers as $key => $value) { - if (!isset($savedValue[$key])) { - $this->getHeaders()->remove($name, $key); - } - } - } + foreach ($this->savedMessage['headers'] as $name => $savedValue) { + $headers = $this->getHeaders()->getAll($name); + + foreach ($headers as $key => $value) { + if (!isset($savedValue[$key])) { + $this->getHeaders()->remove($name, $key); + } + } + } } - + /** * Restore message body */ protected function restoreMessage() { - $this->setBody($this->savedMessage['body']); - $this->setChildren($this->savedMessage['children']); - - $this->restoreHeaders(); - $this->savedMessage = array(); + $this->setBody($this->savedMessage['body']); + $this->setChildren($this->savedMessage['children']); + + $this->restoreHeaders(); + $this->savedMessage = array(); } } diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Attachment.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Attachment.php index 108a02adf..d9d965297 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Attachment.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Attachment.php @@ -11,8 +11,6 @@ /** * An attachment, in a multipart message. * - * @package Swift - * @subpackage Mime * @author Chris Corbyn */ class Swift_Mime_Attachment extends Swift_Mime_SimpleMimeEntity diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/CharsetObserver.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/CharsetObserver.php index bfd41edfe..57d8bc465 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/CharsetObserver.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/CharsetObserver.php @@ -11,8 +11,6 @@ /** * Observes changes in an Mime entity's character set. * - * @package Swift - * @subpackage Mime * @author Chris Corbyn */ interface Swift_Mime_CharsetObserver diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder.php index 67fbf94df..3338b629f 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder.php @@ -11,8 +11,6 @@ /** * Interface for all Transfer Encoding schemes. * - * @package Swift - * @subpackage Mime * @author Chris Corbyn */ interface Swift_Mime_ContentEncoder extends Swift_Encoder diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/Base64ContentEncoder.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/Base64ContentEncoder.php index ed9baf469..073daaf68 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/Base64ContentEncoder.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/Base64ContentEncoder.php @@ -11,8 +11,6 @@ /** * Handles Base 64 Transfer Encoding in Swift Mailer. * - * @package Swift - * @subpackage Mime * @author Chris Corbyn */ class Swift_Mime_ContentEncoder_Base64ContentEncoder extends Swift_Encoder_Base64Encoder implements Swift_Mime_ContentEncoder diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/NativeQpContentEncoder.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/NativeQpContentEncoder.php index ce7c31ea8..e97195a58 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/NativeQpContentEncoder.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/NativeQpContentEncoder.php @@ -11,8 +11,6 @@ /** * Handles Quoted Printable (QP) Transfer Encoding in Swift Mailer using the PHP core function. * - * @package Swift - * @subpackage Mime * @author Lars Strojny */ class Swift_Mime_ContentEncoder_NativeQpContentEncoder implements Swift_Mime_ContentEncoder diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/PlainContentEncoder.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/PlainContentEncoder.php index c48e6bb82..818e9af6e 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/PlainContentEncoder.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/PlainContentEncoder.php @@ -11,8 +11,6 @@ /** * Handles binary/7/8-bit Transfer Encoding in Swift Mailer. * - * @package Swift - * @subpackage Mime * @author Chris Corbyn */ class Swift_Mime_ContentEncoder_PlainContentEncoder implements Swift_Mime_ContentEncoder @@ -106,8 +104,6 @@ public function charsetChanged($charset) { } - // -- Private methods - /** * A safer (but weaker) wordwrap for unicode. * diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/QpContentEncoder.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/QpContentEncoder.php index 6df4a5f3f..49ea90e6d 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/QpContentEncoder.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/QpContentEncoder.php @@ -11,8 +11,6 @@ /** * Handles Quoted Printable (QP) Transfer Encoding in Swift Mailer. * - * @package Swift - * @subpackage Mime * @author Chris Corbyn */ class Swift_Mime_ContentEncoder_QpContentEncoder extends Swift_Encoder_QpEncoder implements Swift_Mime_ContentEncoder diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/QpContentEncoderProxy.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/QpContentEncoderProxy.php index 491409acd..8480f99fe 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/QpContentEncoderProxy.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/QpContentEncoderProxy.php @@ -13,8 +13,6 @@ * * Switches on the best QP encoder implementation for current charset. * - * @package Swift - * @subpackage Mime * @author Jean-François Simon */ class Swift_Mime_ContentEncoder_QpContentEncoderProxy implements Swift_Mime_ContentEncoder diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/RawContentEncoder.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/RawContentEncoder.php index 8f1f9b575..f717dc789 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/RawContentEncoder.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/RawContentEncoder.php @@ -11,8 +11,6 @@ /** * Handles raw Transfer Encoding in Swift Mailer. * - * @package Swift - * @subpackage Mime * * @author Sebastiaan Stok */ diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/EmbeddedFile.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/EmbeddedFile.php index 9079fabf5..ec1ef535f 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/EmbeddedFile.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/EmbeddedFile.php @@ -11,8 +11,6 @@ /** * An embedded file, in a multipart message. * - * @package Swift - * @subpackage Mime * @author Chris Corbyn */ class Swift_Mime_EmbeddedFile extends Swift_Mime_Attachment diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/EncodingObserver.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/EncodingObserver.php index e7e6f20d6..e262974bb 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/EncodingObserver.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/EncodingObserver.php @@ -11,8 +11,6 @@ /** * Observes changes for a Mime entity's ContentEncoder. * - * @package Swift - * @subpackage Mime * @author Chris Corbyn */ interface Swift_Mime_EncodingObserver diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Grammar.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Grammar.php index 9b0670741..bd8e6f96b 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Grammar.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Grammar.php @@ -11,8 +11,6 @@ /** * Defines the grammar to use for validation, implements the RFC 2822 (and friends) ABNF grammar definitions. * - * @package Swift - * @subpackage Mime * @author Fabien Potencier * @author Chris Corbyn */ diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Header.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Header.php index 8a3d05f83..7074c4f6a 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Header.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Header.php @@ -11,8 +11,6 @@ /** * A MIME Header. * - * @package Swift - * @subpackage Mime * @author Chris Corbyn */ interface Swift_Mime_Header diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder.php index 4aff4dc95..6e014a1d3 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder.php @@ -11,8 +11,6 @@ /** * Interface for all Header Encoding schemes. * - * @package Swift - * @subpackage Mime * @author Chris Corbyn */ interface Swift_Mime_HeaderEncoder extends Swift_Encoder diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder/Base64HeaderEncoder.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder/Base64HeaderEncoder.php index 7a57e3f74..6dbc6edcd 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder/Base64HeaderEncoder.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder/Base64HeaderEncoder.php @@ -11,8 +11,6 @@ /** * Handles Base64 (B) Header Encoding in Swift Mailer. * - * @package Swift - * @subpackage Mime * @author Chris Corbyn */ class Swift_Mime_HeaderEncoder_Base64HeaderEncoder extends Swift_Encoder_Base64Encoder implements Swift_Mime_HeaderEncoder diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder/QpHeaderEncoder.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder/QpHeaderEncoder.php index 1527f4ff9..dd8ff382c 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder/QpHeaderEncoder.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder/QpHeaderEncoder.php @@ -11,8 +11,6 @@ /** * Handles Quoted Printable (Q) Header Encoding in Swift Mailer. * - * @package Swift - * @subpackage Mime * @author Chris Corbyn */ class Swift_Mime_HeaderEncoder_QpHeaderEncoder extends Swift_Encoder_QpEncoder implements Swift_Mime_HeaderEncoder diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/HeaderFactory.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/HeaderFactory.php index 40a1e1739..423cebcf4 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/HeaderFactory.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/HeaderFactory.php @@ -11,8 +11,6 @@ /** * Creates MIME headers. * - * @package Swift - * @subpackage Mime * @author Chris Corbyn */ interface Swift_Mime_HeaderFactory extends Swift_Mime_CharsetObserver diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/HeaderSet.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/HeaderSet.php index 309bcd861..b91406629 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/HeaderSet.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/HeaderSet.php @@ -11,8 +11,6 @@ /** * A collection of MIME headers. * - * @package Swift - * @subpackage Mime * @author Chris Corbyn */ interface Swift_Mime_HeaderSet extends Swift_Mime_CharsetObserver diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/AbstractHeader.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/AbstractHeader.php index cdf79036a..1050de776 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/AbstractHeader.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/AbstractHeader.php @@ -11,8 +11,6 @@ /** * An abstract base MIME Header. * - * @package Swift - * @subpackage Mime * @author Chris Corbyn */ abstract class Swift_Mime_Headers_AbstractHeader implements Swift_Mime_Header @@ -439,7 +437,6 @@ protected function clearCachedValueIf($condition) } } - // -- Private methods /** * Generate a list of all tokens in the final header. @@ -463,6 +460,7 @@ protected function toTokens($string = null) $tokens[] = $newToken; } } + return $tokens; } diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/DateHeader.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/DateHeader.php index 015bc4421..a1093fb08 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/DateHeader.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/DateHeader.php @@ -11,8 +11,6 @@ /** * A Date MIME Header for Swift Mailer. * - * @package Swift - * @subpackage Mime * @author Chris Corbyn */ class Swift_Mime_Headers_DateHeader extends Swift_Mime_Headers_AbstractHeader diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/IdentificationHeader.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/IdentificationHeader.php index 1d00015e8..bf45aa944 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/IdentificationHeader.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/IdentificationHeader.php @@ -11,8 +11,6 @@ /** * An ID MIME Header for something like Message-ID or Content-ID. * - * @package Swift - * @subpackage Mime * @author Chris Corbyn */ class Swift_Mime_Headers_IdentificationHeader extends Swift_Mime_Headers_AbstractHeader diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/MailboxHeader.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/MailboxHeader.php index 766d6a18d..f8378d042 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/MailboxHeader.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/MailboxHeader.php @@ -11,8 +11,6 @@ /** * A Mailbox Address MIME Header for something like From or Sender. * - * @package Swift - * @subpackage Mime * @author Chris Corbyn */ class Swift_Mime_Headers_MailboxHeader extends Swift_Mime_Headers_AbstractHeader @@ -312,8 +310,6 @@ protected function tokenNeedsEncoding($token) return preg_match('/[,;]/', $token) || parent::tokenNeedsEncoding($token); } - // -- Private methods - /** * Return an array of strings conforming the the name-addr spec of RFC 2822. * diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/OpenDKIMHeader.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/OpenDKIMHeader.php index ecab7380b..0b72e15db 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/OpenDKIMHeader.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/OpenDKIMHeader.php @@ -11,8 +11,6 @@ /** * An OpenDKIM Specific Header using only raw header datas without encoding * - * @package Swift - * @subpackage Mime * @author De Cock Xavier */ class Swift_Mime_Headers_OpenDKIMHeader implements Swift_Mime_Header @@ -23,14 +21,14 @@ class Swift_Mime_Headers_OpenDKIMHeader implements Swift_Mime_Header * @var string */ private $_value; - + /** * The name of this Header * @var string */ private $_fieldName; - /** + /** * Creates a new SimpleHeader with $name. * * @param string $name @@ -108,7 +106,7 @@ public function getFieldBody() { return $this->_value; } - + /** * Get this Header rendered as a RFC 2822 compliant string. * @@ -116,24 +114,24 @@ public function getFieldBody() */ public function toString() { - return $this->_fieldName.': '.$this->_value; + return $this->_fieldName.': '.$this->_value; } - + /** * Set the Header FieldName * @see Swift_Mime_Header::getFieldName() */ - public function getFieldName() - { + public function getFieldName() + { return $this->_fieldName; } - /** + /** * Ignored */ - public function setCharset($charset) + public function setCharset($charset) { - + } - + } diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/ParameterizedHeader.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/ParameterizedHeader.php index 7f52857e1..6bfdc9bc2 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/ParameterizedHeader.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/ParameterizedHeader.php @@ -11,8 +11,6 @@ /** * An abstract base MIME Header. * - * @package Swift - * @subpackage Mime * @author Chris Corbyn */ class Swift_Mime_Headers_ParameterizedHeader extends Swift_Mime_Headers_UnstructuredHeader implements Swift_Mime_ParameterizedHeader @@ -144,7 +142,6 @@ public function getFieldBody() //TODO: Check caching here return $body; } - // -- Protected methods /** * Generate a list of all tokens in the final header. @@ -174,8 +171,6 @@ protected function toTokens($string = null) return $tokens; } - // -- Private methods - /** * Render a RFC 2047 compliant header parameter from the $name and $value. * diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/PathHeader.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/PathHeader.php index bfecf3f47..9db2f9f48 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/PathHeader.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/PathHeader.php @@ -11,8 +11,6 @@ /** * A Path Header in Swift Mailer, such a Return-Path. * - * @package Swift - * @subpackage Mime * @author Chris Corbyn */ class Swift_Mime_Headers_PathHeader extends Swift_Mime_Headers_AbstractHeader diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/UnstructuredHeader.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/UnstructuredHeader.php index 2de49b4d0..41d4e63d7 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/UnstructuredHeader.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/UnstructuredHeader.php @@ -11,8 +11,6 @@ /** * A Simple MIME Header. * - * @package Swift - * @subpackage Mime * @author Chris Corbyn */ class Swift_Mime_Headers_UnstructuredHeader extends Swift_Mime_Headers_AbstractHeader diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Message.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Message.php index 59df2f2e9..29bc4b337 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Message.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Message.php @@ -11,8 +11,6 @@ /** * A Message (RFC 2822) object. * - * @package Swift - * @subpackage Mime * @author Chris Corbyn */ interface Swift_Mime_Message extends Swift_Mime_MimeEntity diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/MimeEntity.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/MimeEntity.php index bc9f2ad37..2fe5cc2d5 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/MimeEntity.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/MimeEntity.php @@ -11,8 +11,6 @@ /** * A MIME entity, such as an attachment. * - * @package Swift - * @subpackage Mime * @author Chris Corbyn */ interface Swift_Mime_MimeEntity extends Swift_Mime_CharsetObserver, Swift_Mime_EncodingObserver diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/MimePart.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/MimePart.php index 1efcc8cd7..f67a864bd 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/MimePart.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/MimePart.php @@ -11,8 +11,6 @@ /** * A MIME part, in a multipart message. * - * @package Swift - * @subpackage Mime * @author Chris Corbyn */ class Swift_Mime_MimePart extends Swift_Mime_SimpleMimeEntity @@ -173,8 +171,6 @@ public function charsetChanged($charset) $this->setCharset($charset); } - // -- Protected methods - /** Fix the content-type and encoding of this entity */ protected function _fixHeaders() { diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ParameterizedHeader.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ParameterizedHeader.php index 95172ec40..ea793201e 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ParameterizedHeader.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ParameterizedHeader.php @@ -11,8 +11,6 @@ /** * A MIME Header with parameters. * - * @package Swift - * @subpackage Mime * @author Chris Corbyn */ interface Swift_Mime_ParameterizedHeader extends Swift_Mime_Header diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderFactory.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderFactory.php index b82e33b4d..fe397fd01 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderFactory.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderFactory.php @@ -11,8 +11,6 @@ /** * Creates MIME headers. * - * @package Swift - * @subpackage Mime * @author Chris Corbyn */ class Swift_Mime_SimpleHeaderFactory implements Swift_Mime_HeaderFactory @@ -180,8 +178,6 @@ public function charsetChanged($charset) $this->_paramEncoder->charsetChanged($charset); } - // -- Private methods - /** Apply the charset to the Header */ private function _setHeaderCharset(Swift_Mime_Header $header) { diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderSet.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderSet.php index bd6ed6bcd..3bc60e149 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderSet.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderSet.php @@ -11,8 +11,6 @@ /** * A collection of MIME headers. * - * @package Swift - * @subpackage Mime * @author Chris Corbyn */ class Swift_Mime_SimpleHeaderSet implements Swift_Mime_HeaderSet @@ -327,8 +325,6 @@ public function __toString() return $this->toString(); } - // -- Private methods - /** Save a Header to the internal collection */ private function _storeHeader($name, Swift_Mime_Header $header, $offset = null) { diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleMessage.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleMessage.php index 4b2c88b4d..640a4644c 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleMessage.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleMessage.php @@ -11,8 +11,6 @@ /** * The default email message class. * - * @package Swift - * @subpackage Mime * @author Chris Corbyn */ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart implements Swift_Mime_Message @@ -615,7 +613,6 @@ public function toByteStream(Swift_InputByteStream $is) } } - // -- Protected methods /** @see Swift_Mime_SimpleMimeEntity::_getIdField() */ protected function _getIdField() @@ -638,8 +635,6 @@ protected function _becomeMimePart() return $part; } - // -- Private methods - /** Get the highest nesting level nested inside this message */ private function _getTopNestingLevel() { diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleMimeEntity.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleMimeEntity.php index e2fc7296d..d69508147 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleMimeEntity.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleMimeEntity.php @@ -11,8 +11,6 @@ /** * A MIME entity, in a multipart message. * - * @package Swift - * @subpackage Mime * @author Chris Corbyn */ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_MimeEntity @@ -577,8 +575,6 @@ protected function _bodyToByteStream(Swift_InputByteStream $is) } } - // -- Protected methods - /** * Get the name of the header that provides the ID of this entity */ @@ -699,8 +695,6 @@ protected function getRandomId() return $id; } - // -- Private methods - private function _readStream(Swift_OutputByteStream $os) { $string = ''; diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/MimePart.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/MimePart.php index 10a4f3c86..5702d1c14 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/MimePart.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/MimePart.php @@ -11,8 +11,6 @@ /** * A MIME part, in a multipart message. * - * @package Swift - * @subpackage Mime * @author Chris Corbyn */ class Swift_MimePart extends Swift_Mime_MimePart diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/NullTransport.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/NullTransport.php index 335c47934..726d83ca1 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/NullTransport.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/NullTransport.php @@ -11,7 +11,6 @@ /** * Pretends messages have been sent, but just ignores them. * - * @package Swift * @author Fabien Potencier */ class Swift_NullTransport extends Swift_Transport_NullTransport diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/OutputByteStream.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/OutputByteStream.php index 47faa73af..0c2783f0f 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/OutputByteStream.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/OutputByteStream.php @@ -14,8 +14,6 @@ * Classes implementing this interface may use a subsystem which requires less * memory than working with large strings of data. * - * @package Swift - * @subpackage ByteStream * @author Chris Corbyn */ interface Swift_OutputByteStream diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/AntiFloodPlugin.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/AntiFloodPlugin.php index 307da9d77..28f3a817b 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/AntiFloodPlugin.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/AntiFloodPlugin.php @@ -11,8 +11,6 @@ /** * Reduces network flooding when sending large amounts of mail. * - * @package Swift - * @subpackage Plugins * @author Chris Corbyn */ class Swift_Plugins_AntiFloodPlugin implements Swift_Events_SendListener, Swift_Plugins_Sleeper diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/BandwidthMonitorPlugin.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/BandwidthMonitorPlugin.php index 8794aacf0..af1701a06 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/BandwidthMonitorPlugin.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/BandwidthMonitorPlugin.php @@ -11,8 +11,6 @@ /** * Reduces network flooding when sending large amounts of mail. * - * @package Swift - * @subpackage Plugins * @author Chris Corbyn */ class Swift_Plugins_BandwidthMonitorPlugin implements Swift_Events_SendListener, Swift_Events_CommandListener, Swift_Events_ResponseListener, Swift_InputByteStream diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Decorator/Replacements.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Decorator/Replacements.php index 3269c6982..861843398 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Decorator/Replacements.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Decorator/Replacements.php @@ -11,8 +11,6 @@ /** * Allows customization of Messages on-the-fly. * - * @package Swift - * @subpackage Plugins * @author Chris Corbyn */ interface Swift_Plugins_Decorator_Replacements diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/DecoratorPlugin.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/DecoratorPlugin.php index 84f70709e..e1aaebe9c 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/DecoratorPlugin.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/DecoratorPlugin.php @@ -11,8 +11,6 @@ /** * Allows customization of Messages on-the-fly. * - * @package Swift - * @subpackage Plugins * @author Chris Corbyn * @author Fabien Potencier */ @@ -177,8 +175,6 @@ public function sendPerformed(Swift_Events_SendEvent $evt) $this->_restoreMessage($evt->getMessage()); } - // -- Private methods - /** Restore a changed message back to its original state */ private function _restoreMessage(Swift_Mime_Message $message) { diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/ImpersonatePlugin.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/ImpersonatePlugin.php index 1f1e4430c..e2999490a 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/ImpersonatePlugin.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/ImpersonatePlugin.php @@ -10,8 +10,6 @@ /** * Replaces the sender of a message. * - * @package Swift - * @subpackage Plugins * @author Arjen Brouwer */ class Swift_Plugins_ImpersonatePlugin implements Swift_Events_SendListener diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Logger.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Logger.php index 81c1d9bb8..915e72066 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Logger.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Logger.php @@ -11,8 +11,6 @@ /** * Logs events in the Transport system. * - * @package Swift - * @subpackage Transport * @author Chris Corbyn */ interface Swift_Plugins_Logger diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/LoggerPlugin.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/LoggerPlugin.php index cfe9ca134..98e590528 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/LoggerPlugin.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/LoggerPlugin.php @@ -11,8 +11,6 @@ /** * Does real time logging of Transport level information. * - * @package Swift - * @subpackage Plugins * @author Chris Corbyn */ class Swift_Plugins_LoggerPlugin implements Swift_Events_CommandListener, Swift_Events_ResponseListener, Swift_Events_TransportChangeListener, Swift_Events_TransportExceptionListener, Swift_Plugins_Logger diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Loggers/ArrayLogger.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Loggers/ArrayLogger.php index eb362ef83..f1739e8e6 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Loggers/ArrayLogger.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Loggers/ArrayLogger.php @@ -11,8 +11,6 @@ /** * Logs to an Array backend. * - * @package Swift - * @subpackage Transport * @author Chris Corbyn */ class Swift_Plugins_Loggers_ArrayLogger implements Swift_Plugins_Logger diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Loggers/EchoLogger.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Loggers/EchoLogger.php index 73b95545b..e8b6c18a3 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Loggers/EchoLogger.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Loggers/EchoLogger.php @@ -11,8 +11,6 @@ /** * Prints all log messages in real time. * - * @package Swift - * @subpackage Transport * @author Chris Corbyn */ class Swift_Plugins_Loggers_EchoLogger implements Swift_Plugins_Logger diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/MessageLogger.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/MessageLogger.php index b5dfa8b13..a02ad98e8 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/MessageLogger.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/MessageLogger.php @@ -11,8 +11,6 @@ /** * Stores all sent emails for further usage. * - * @package Swift - * @subpackage Plugins * @author Fabien Potencier */ class Swift_Plugins_MessageLogger implements Swift_Events_SendListener diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Pop/Pop3Connection.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Pop/Pop3Connection.php index d24172152..1e18016a9 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Pop/Pop3Connection.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Pop/Pop3Connection.php @@ -11,8 +11,6 @@ /** * Pop3Connection interface for connecting and disconnecting to a POP3 host. * - * @package Swift - * @subpackage Plugins * @author Chris Corbyn */ interface Swift_Plugins_Pop_Pop3Connection diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Pop/Pop3Exception.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Pop/Pop3Exception.php index 02d421e70..870207269 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Pop/Pop3Exception.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Pop/Pop3Exception.php @@ -11,8 +11,6 @@ /** * Pop3Exception thrown when an error occurs connecting to a POP3 host. * - * @package Swift - * @subpackage Transport * @author Chris Corbyn */ class Swift_Plugins_Pop_Pop3Exception extends Swift_IoException diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/PopBeforeSmtpPlugin.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/PopBeforeSmtpPlugin.php index 379c45141..57eea9a7f 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/PopBeforeSmtpPlugin.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/PopBeforeSmtpPlugin.php @@ -11,8 +11,6 @@ /** * Makes sure a connection to a POP3 host has been established prior to connecting to SMTP. * - * @package Swift - * @subpackage Plugins * @author Chris Corbyn */ class Swift_Plugins_PopBeforeSmtpPlugin implements Swift_Events_TransportChangeListener, Swift_Plugins_Pop_Pop3Connection @@ -230,8 +228,6 @@ public function transportStopped(Swift_Events_TransportChangeEvent $evt) { } - // -- Private Methods - private function _command($command) { if (!fwrite($this->_socket, $command)) { diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/RedirectingPlugin.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/RedirectingPlugin.php index 3b006b67a..90f380bcc 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/RedirectingPlugin.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/RedirectingPlugin.php @@ -11,8 +11,6 @@ /** * Redirects all email to a single recipient. * - * @package Swift - * @subpackage Plugins * @author Fabien Potencier */ class Swift_Plugins_RedirectingPlugin implements Swift_Events_SendListener @@ -184,8 +182,6 @@ public function sendPerformed(Swift_Events_SendEvent $evt) $this->_restoreMessage($evt->getMessage()); } - // -- Private methods - private function _restoreMessage(Swift_Mime_Message $message) { // restore original headers diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Reporter.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Reporter.php index 504c0c888..294b547d2 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Reporter.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Reporter.php @@ -11,8 +11,6 @@ /** * The Reporter plugin sends pass/fail notification to a Reporter. * - * @package Swift - * @subpackage Plugins * @author Chris Corbyn */ interface Swift_Plugins_Reporter diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/ReporterPlugin.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/ReporterPlugin.php index e79c6bbff..644b208a0 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/ReporterPlugin.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/ReporterPlugin.php @@ -11,8 +11,6 @@ /** * Does real time reporting of pass/fail for each recipient. * - * @package Swift - * @subpackage Plugins * @author Chris Corbyn */ class Swift_Plugins_ReporterPlugin implements Swift_Events_SendListener diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Reporters/HitReporter.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Reporters/HitReporter.php index 5890eea91..ea60f51dc 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Reporters/HitReporter.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Reporters/HitReporter.php @@ -11,8 +11,6 @@ /** * A reporter which "collects" failures for the Reporter plugin. * - * @package Swift - * @subpackage Plugins * @author Chris Corbyn */ class Swift_Plugins_Reporters_HitReporter implements Swift_Plugins_Reporter diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Reporters/HtmlReporter.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Reporters/HtmlReporter.php index cd3b98425..4480d255c 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Reporters/HtmlReporter.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Reporters/HtmlReporter.php @@ -11,8 +11,6 @@ /** * A HTML output reporter for the Reporter plugin. * - * @package Swift - * @subpackage Plugins * @author Chris Corbyn */ class Swift_Plugins_Reporters_HtmlReporter implements Swift_Plugins_Reporter diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Sleeper.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Sleeper.php index 35a63b4fb..38727052b 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Sleeper.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Sleeper.php @@ -11,8 +11,6 @@ /** * Sleeps for a duration of time. * - * @package Swift - * @subpackage Plugins * @author Chris Corbyn */ interface Swift_Plugins_Sleeper diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/ThrottlerPlugin.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/ThrottlerPlugin.php index 933104e08..0d2c135e4 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/ThrottlerPlugin.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/ThrottlerPlugin.php @@ -11,8 +11,6 @@ /** * Throttles the rate at which emails are sent. * - * @package Swift - * @subpackage Plugins * @author Chris Corbyn */ class Swift_Plugins_ThrottlerPlugin extends Swift_Plugins_BandwidthMonitorPlugin implements Swift_Plugins_Sleeper, Swift_Plugins_Timer @@ -99,7 +97,7 @@ public function beforeSendPerformed(Swift_Events_SendEvent $evt) } $duration = $time - $this->_start; - switch($this->_mode) { + switch ($this->_mode) { case self::BYTES_PER_MINUTE : $sleep = $this->_throttleBytesPerMinute($duration); break; @@ -158,8 +156,6 @@ public function getTimestamp() } } - // -- Private methods - /** * Get a number of seconds to sleep for. * diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Timer.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Timer.php index 12dd09b8b..a05e3181e 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Timer.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Timer.php @@ -11,8 +11,6 @@ /** * Provides timestamp data. * - * @package Swift - * @subpackage Plugins * @author Chris Corbyn */ interface Swift_Plugins_Timer diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Preferences.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Preferences.php index 629436f57..7cd61312d 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Preferences.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Preferences.php @@ -11,7 +11,6 @@ /** * Changes some global preference settings in Swift Mailer. * - * @package Swift * @author Chris Corbyn */ class Swift_Preferences diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/ReplacementFilterFactory.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/ReplacementFilterFactory.php index 4b6eed584..ca9e4f60d 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/ReplacementFilterFactory.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/ReplacementFilterFactory.php @@ -11,7 +11,6 @@ /** * Creates StreamFilters. * - * @package Swift * @author Chris Corbyn */ interface Swift_ReplacementFilterFactory diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/RfcComplianceException.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/RfcComplianceException.php index 6a2a49b87..cdb2bee23 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/RfcComplianceException.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/RfcComplianceException.php @@ -11,7 +11,6 @@ /** * RFC Compliance Exception class. * - * @package Swift * @author Chris Corbyn */ class Swift_RfcComplianceException extends Swift_SwiftException diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/SendmailTransport.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/SendmailTransport.php index d5fc72d7f..1ef0e5e17 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/SendmailTransport.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/SendmailTransport.php @@ -11,8 +11,6 @@ /** * SendmailTransport for sending mail through a Sendmail/Postfix (etc..) binary. * - * @package Swift - * @subpackage Transport * @author Chris Corbyn */ class Swift_SendmailTransport extends Swift_Transport_SendmailTransport diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/SignedMessage.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/SignedMessage.php index c4fb2c73c..9aef721bc 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/SignedMessage.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/SignedMessage.php @@ -10,11 +10,9 @@ /** * Signed Message, message that can be signed using a signer. - * + * * This class is only kept for compatibility * - * @package Swift - * @subpackage Signed * * @author Xavier De Cock * @deprecated diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signer.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signer.php index 865f557e0..7448179fb 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signer.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signer.php @@ -11,8 +11,6 @@ /** * Base Class of Signer Infrastructure. * - * @package Swift - * @subpackage Signatures * * @author Xavier De Cock */ diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/BodySigner.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/BodySigner.php index 1d700fb17..93dc8ac7a 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/BodySigner.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/BodySigner.php @@ -11,8 +11,6 @@ /** * Body Signer Interface used to apply Body-Based Signature to a message * - * @package Swift - * @subpackage Signatures * @author Xavier De Cock */ interface Swift_Signers_BodySigner extends Swift_Signer diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/DKIMSigner.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/DKIMSigner.php index f2a25149f..7e3f215f9 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/DKIMSigner.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/DKIMSigner.php @@ -11,8 +11,6 @@ /** * DKIM Signer used to apply DKIM Signature to a message * - * @package Swift - * @subpackage Signatures * @author Xavier De Cock */ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner @@ -187,18 +185,18 @@ public function __construct($privateKey, $domainName, $selector) /** * Instanciate DKIMSigner - * + * * @param string $privateKey * @param string $domainName * @param string $selector * @return Swift_Signers_DKIMSigner */ - public static function newInstance($privateKey, $domainName, $selector) + public static function newInstance($privateKey, $domainName, $selector) { return new static($privateKey, $domainName, $selector); } - - + + /** * Reset the Signer * @see Swift_Signer::reset() @@ -212,7 +210,7 @@ public function reset() $this->_bodyHashHandler = null; $this->_bodyCanonIgnoreStart = 2; $this->_bodyCanonEmptyCounter = 0; - $this->_bodyCanonLastChar = NULL; + $this->_bodyCanonLastChar = null; $this->_bodyCanonSpace = false; } @@ -279,6 +277,7 @@ public function unbind(Swift_InputByteStream $is) foreach ($this->_bound as $k => $stream) { if ($stream === $is) { unset($this->_bound[$k]); + return; } } diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/DomainKeySigner.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/DomainKeySigner.php index d6d728fcc..3d361f324 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/DomainKeySigner.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/DomainKeySigner.php @@ -11,8 +11,6 @@ /** * DomainKey Signer used to apply DomainKeys Signature to a message * - * @package Swift - * @subpackage Signatures * @author Xavier De Cock */ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner @@ -141,10 +139,11 @@ public function __construct($privateKey, $domainName, $selector) * @param string $selector * @return Swift_Signers_DomainKeySigner */ - public static function newInstance($privateKey, $domainName, $selector) { + public static function newInstance($privateKey, $domainName, $selector) + { return new static($privateKey, $domainName, $selector); } - + /** * Resets internal states * @@ -156,7 +155,7 @@ public function reset() $this->_hashHandler = null; $this->_bodyCanonIgnoreStart = 2; $this->_bodyCanonEmptyCounter = 0; - $this->_bodyCanonLastChar = NULL; + $this->_bodyCanonLastChar = null; $this->_bodyCanonSpace = false; return $this; diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/HeaderSigner.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/HeaderSigner.php index 944deac6f..67c794130 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/HeaderSigner.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/HeaderSigner.php @@ -11,8 +11,6 @@ /** * Header Signer Interface used to apply Header-Based Signature to a message * - * @package Swift - * @subpackage Signatures * @author Xavier De Cock */ interface Swift_Signers_HeaderSigner extends Swift_Signer, Swift_InputByteStream diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/OpenDKIMSigner.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/OpenDKIMSigner.php index 22b57cb8b..6b1138924 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/OpenDKIMSigner.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/OpenDKIMSigner.php @@ -8,13 +8,10 @@ * file that was distributed with this source code. */ - /** * DKIM Signer used to apply DKIM Signature to a message - * Takes advantage of pecl extension + * Takes advantage of pecl extension * - * @package Swift - * @subpackage Signatures * @author Xavier De Cock */ class Swift_Signers_OpenDKIMSigner extends Swift_Signers_DKIMSigner @@ -39,7 +36,7 @@ public function __construct($privateKey, $domainName, $selector) } parent::__construct($privateKey, $domainName, $selector); } - + public static function newInstance($privateKey, $domainName, $selector) { return new static($privateKey, $domainName, $selector); @@ -70,14 +67,14 @@ public function setHeaders(Swift_Mime_HeaderSet $headers) $this->_dkimHandler = new OpenDKIMSign($this->_privateKey, $this->_selector, $this->_domainName, $headerCanon, $bodyCanon, $hash, $bodyLen); // Hardcode signature Margin for now $this->_dkimHandler->setMargin(78); - + if (!is_numeric($this->_signatureTimestamp)) { - OpenDKIM::setOption(OpenDKIM::OPTS_FIXEDTIME, time()); + OpenDKIM::setOption(OpenDKIM::OPTS_FIXEDTIME, time()); } else { - if (!OpenDKIM::setOption(OpenDKIM::OPTS_FIXEDTIME, $this->_signatureTimestamp)) { - throw new Swift_SwiftException('Unable to force signature timestamp ['.openssl_error_string().']'); - } - } + if (!OpenDKIM::setOption(OpenDKIM::OPTS_FIXEDTIME, $this->_signatureTimestamp)) { + throw new Swift_SwiftException('Unable to force signature timestamp ['.openssl_error_string().']'); + } + } if (isset($this->_signerIdentity)) { $this->_dkimHandler->setSigner($this->_signerIdentity); } @@ -89,7 +86,7 @@ public function setHeaders(Swift_Mime_HeaderSet $headers) if ($headers->has($hName)) { foreach ($tmp as $header) { if ($header->getFieldBody() != '') { - $htosign = $header->toString(); + $htosign = $header->toString(); $this->_dkimHandler->header($htosign); $this->_signedHeaders[] = $header->getFieldName(); } @@ -97,6 +94,7 @@ public function setHeaders(Swift_Mime_HeaderSet $headers) } } } + return $this; } @@ -107,15 +105,17 @@ public function startBody() } $this->dropFirstLF = true; $this->_dkimHandler->eoh(); + return $this; } public function endBody() { if (! $this->_peclLoaded) { - return parent::endBody(); + return parent::endBody(); } $this->_dkimHandler->eom(); + return $this; } @@ -123,6 +123,7 @@ public function reset() { $this->_dkimHandler = null; parent::reset(); + return $this; } @@ -134,10 +135,11 @@ public function reset() */ public function setSignatureTimestamp($time) { - $this->_signatureTimestamp = $time; - return $this; + $this->_signatureTimestamp = $time; + + return $this; } - + /** * Set the signature expiration timestamp * @@ -146,11 +148,11 @@ public function setSignatureTimestamp($time) */ public function setSignatureExpiration($time) { - $this->_signatureExpiration = $time; - - return $this; + $this->_signatureExpiration = $time; + + return $this; } - + /** * Enable / disable the DebugHeaders * @@ -163,7 +165,7 @@ public function setDebugHeaders($debug) return $this; } - + // Protected protected function _canonicalizeBody($string) @@ -178,7 +180,7 @@ protected function _canonicalizeBody($string) } $this->dropFirstLF = false; if (strlen($string)) { - $this->_dkimHandler->body($string); + $this->_dkimHandler->body($string); } } } diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/SMimeSigner.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/SMimeSigner.php index 5b75e9bcb..21ed4af1f 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/SMimeSigner.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/SMimeSigner.php @@ -11,8 +11,6 @@ /** * MIME Message Signer used to apply S/MIME Signature/Encryption to a message. * - * @package Swift - * @subpackage Signatures * * @author Romain-Geissler * @author Sebastiaan Stok diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/SmtpTransport.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/SmtpTransport.php index b369f0451..5d4945e17 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/SmtpTransport.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/SmtpTransport.php @@ -11,8 +11,6 @@ /** * Sends Messages over SMTP with ESMTP support. * - * @package Swift - * @subpackage Transport * @author Chris Corbyn * @method Swift_SmtpTransport setUsername(string $username) Set the username to authenticate with. * @method string getUsername() Get the username to authenticate with. diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Spool.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Spool.php index 670be25bd..afae5fac3 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Spool.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Spool.php @@ -11,7 +11,6 @@ /** * Interface for spools. * - * @package Swift * @author Fabien Potencier */ interface Swift_Spool diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/SpoolTransport.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/SpoolTransport.php index 8a135d4ca..9351c40d3 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/SpoolTransport.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/SpoolTransport.php @@ -11,7 +11,6 @@ /** * Stores Messages in a queue. * - * @package Swift * @author Fabien Potencier */ class Swift_SpoolTransport extends Swift_Transport_SpoolTransport diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/StreamFilter.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/StreamFilter.php index b62e75159..1c3fd3a57 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/StreamFilter.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/StreamFilter.php @@ -11,7 +11,6 @@ /** * Processes bytes as they pass through a stream and performs filtering. * - * @package Swift * @author Chris Corbyn */ interface Swift_StreamFilter diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/StreamFilters/ByteArrayReplacementFilter.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/StreamFilters/ByteArrayReplacementFilter.php index 8cedcbeef..db6edce91 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/StreamFilters/ByteArrayReplacementFilter.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/StreamFilters/ByteArrayReplacementFilter.php @@ -13,7 +13,6 @@ * * This stream filter deals with Byte arrays rather than simple strings. * - * @package Swift * @author Chris Corbyn */ class Swift_StreamFilters_ByteArrayReplacementFilter implements Swift_StreamFilter diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/StreamFilters/StringReplacementFilter.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/StreamFilters/StringReplacementFilter.php index 4075d08a8..e6b9e7b8a 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/StreamFilters/StringReplacementFilter.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/StreamFilters/StringReplacementFilter.php @@ -11,7 +11,6 @@ /** * Processes bytes as they pass through a buffer and replaces sequences in it. * - * @package Swift * @author Chris Corbyn */ class Swift_StreamFilters_StringReplacementFilter implements Swift_StreamFilter diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/StreamFilters/StringReplacementFilterFactory.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/StreamFilters/StringReplacementFilterFactory.php index bb4af7785..4b12cfffd 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/StreamFilters/StringReplacementFilterFactory.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/StreamFilters/StringReplacementFilterFactory.php @@ -11,7 +11,6 @@ /** * Creates filters for replacing needles in a string buffer. * - * @package Swift * @author Chris Corbyn */ class Swift_StreamFilters_StringReplacementFilterFactory implements Swift_ReplacementFilterFactory diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/SwiftException.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/SwiftException.php index f3bcbed90..22ee3eb40 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/SwiftException.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/SwiftException.php @@ -11,7 +11,6 @@ /** * Base Exception class. * - * @package Swift * @author Chris Corbyn */ class Swift_SwiftException extends Exception diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport.php index 69eec54f7..ac97b409f 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport.php @@ -11,8 +11,6 @@ /** * Sends Messages via an abstract Transport subsystem. * - * @package Swift - * @subpackage Transport * @author Chris Corbyn */ interface Swift_Transport diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/AbstractSmtpTransport.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/AbstractSmtpTransport.php index a55ef6733..e5874d28c 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/AbstractSmtpTransport.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/AbstractSmtpTransport.php @@ -11,8 +11,6 @@ /** * Sends Messages over SMTP. * - * @package Swift - * @subpackage Transport * @author Chris Corbyn */ abstract class Swift_Transport_AbstractSmtpTransport implements Swift_Transport @@ -283,8 +281,6 @@ public function executeCommand($command, $codes = array(), &$failures = null) return $response; } - // -- Protected methods - /** Read the opening SMTP greeting */ protected function _readGreeting() { @@ -412,7 +408,6 @@ protected function _getFullResponse($seq) return $response; } - // -- Private methods /** Send an email to the given recipients from the given reverse path */ private function _doMailTransaction($message, $reversePath, array $recipients, array &$failedRecipients) diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/CramMd5Authenticator.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/CramMd5Authenticator.php index 5c26e4b8b..98ee06510 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/CramMd5Authenticator.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/CramMd5Authenticator.php @@ -11,8 +11,6 @@ /** * Handles CRAM-MD5 authentication. * - * @package Swift - * @subpackage Transport * @author Chris Corbyn */ class Swift_Transport_Esmtp_Auth_CramMd5Authenticator implements Swift_Transport_Esmtp_Authenticator diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/LoginAuthenticator.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/LoginAuthenticator.php index 8ff7dee86..ebb35520b 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/LoginAuthenticator.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/LoginAuthenticator.php @@ -11,8 +11,6 @@ /** * Handles LOGIN authentication. * - * @package Swift - * @subpackage Transport * @author Chris Corbyn */ class Swift_Transport_Esmtp_Auth_LoginAuthenticator implements Swift_Transport_Esmtp_Authenticator diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/NTLMAuthenticator.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/NTLMAuthenticator.php index 62eacdd7b..1514cbbe4 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/NTLMAuthenticator.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/NTLMAuthenticator.php @@ -13,8 +13,6 @@ /** * Handles NTLM authentication. * - * @package Swift - * @subpackage Transport * @author Ward Peeters */ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Esmtp_Authenticator diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/PlainAuthenticator.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/PlainAuthenticator.php index 6b5a9db2b..9143ce943 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/PlainAuthenticator.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/PlainAuthenticator.php @@ -11,8 +11,6 @@ /** * Handles PLAIN authentication. * - * @package Swift - * @subpackage Transport * @author Chris Corbyn */ class Swift_Transport_Esmtp_Auth_PlainAuthenticator implements Swift_Transport_Esmtp_Authenticator diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/XOAuth2Authenticator.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/XOAuth2Authenticator.php index de19fc1ba..381898818 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/XOAuth2Authenticator.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/XOAuth2Authenticator.php @@ -18,9 +18,7 @@ * ->setUsername('YOUR_EMAIL_ADDRESS') * ->setPassword('YOUR_ACCESS_TOKEN'); * - * - * @package Swift - * @subpackage Transport + * * @author xu.li * @see https://developers.google.com/google-apps/gmail/xoauth2_protocol */ @@ -58,12 +56,12 @@ public function authenticate(Swift_Transport_SmtpAgent $agent, $email, $token) return false; } } - + /** * Construct the auth parameter * * @see https://developers.google.com/google-apps/gmail/xoauth2_protocol#the_sasl_xoauth2_mechanism - */ + */ protected function constructXOAuth2Params($email, $token) { return base64_encode("user=$email\1auth=Bearer $token\1\1"); diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/AuthHandler.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/AuthHandler.php index 452ab8204..ee2f56d2c 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/AuthHandler.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/AuthHandler.php @@ -11,8 +11,6 @@ /** * An ESMTP handler for AUTH support. * - * @package Swift - * @subpackage Transport * @author Chris Corbyn */ class Swift_Transport_Esmtp_AuthHandler implements Swift_Transport_EsmtpHandler @@ -242,8 +240,6 @@ public function resetState() { } - // -- Protected methods - /** * Returns the authenticator list for the given agent. * diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Authenticator.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Authenticator.php index c1d4a0470..9078003a9 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Authenticator.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Authenticator.php @@ -11,8 +11,6 @@ /** * An Authentication mechanism. * - * @package Swift - * @subpackage Transport * @author Chris Corbyn */ interface Swift_Transport_Esmtp_Authenticator diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/EsmtpHandler.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/EsmtpHandler.php index 83fb71b1e..cb76eddf8 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/EsmtpHandler.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/EsmtpHandler.php @@ -11,8 +11,6 @@ /** * An ESMTP handler. * - * @package Swift - * @subpackage Transport * @author Chris Corbyn */ interface Swift_Transport_EsmtpHandler diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/EsmtpTransport.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/EsmtpTransport.php index 6ad5b098a..d36ae93b1 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/EsmtpTransport.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/EsmtpTransport.php @@ -11,8 +11,6 @@ /** * Sends Messages over SMTP with ESMTP support. * - * @package Swift - * @subpackage Transport * @author Chris Corbyn */ class Swift_Transport_EsmtpTransport extends Swift_Transport_AbstractSmtpTransport implements Swift_Transport_SmtpAgent @@ -267,8 +265,6 @@ public function __call($method, $args) trigger_error('Call to undefined method ' . $method, E_USER_ERROR); } - // -- Protected methods - /** Get the params to initialize the buffer */ protected function _getBufferParams() { @@ -341,8 +337,6 @@ protected function _doRcptToCommand($address) ); } - // -- Private methods - /** Determine ESMTP capabilities by function group */ private function _getCapabilities($ehloResponse) { diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/FailoverTransport.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/FailoverTransport.php index d0d3f69be..020bd057c 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/FailoverTransport.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/FailoverTransport.php @@ -11,8 +11,6 @@ /** * Contains a list of redundant Transports so when one fails, the next is used. * - * @package Swift - * @subpackage Transport * @author Chris Corbyn */ class Swift_Transport_FailoverTransport extends Swift_Transport_LoadBalancedTransport @@ -71,8 +69,6 @@ public function send(Swift_Mime_Message $message, &$failedRecipients = null) return $sent; } - // -- Protected methods - protected function _getNextTransport() { if (!isset($this->_currentTransport)) { diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/IoBuffer.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/IoBuffer.php index 835895118..71b3f1e5d 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/IoBuffer.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/IoBuffer.php @@ -11,8 +11,6 @@ /** * Buffers input and output to a resource. * - * @package Swift - * @subpackage Transport * @author Chris Corbyn */ interface Swift_Transport_IoBuffer extends Swift_InputByteStream, Swift_OutputByteStream diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/LoadBalancedTransport.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/LoadBalancedTransport.php index 7a82632d9..dd27a2d98 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/LoadBalancedTransport.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/LoadBalancedTransport.php @@ -11,8 +11,6 @@ /** * Redundantly and rotationally uses several Transports when sending. * - * @package Swift - * @subpackage Transport * @author Chris Corbyn */ class Swift_Transport_LoadBalancedTransport implements Swift_Transport @@ -139,8 +137,6 @@ public function registerPlugin(Swift_Events_EventListener $plugin) } } - // -- Protected methods - /** * Rotates the transport list around and returns the first instance. * diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/MailInvoker.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/MailInvoker.php index 9103f7943..77489cedc 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/MailInvoker.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/MailInvoker.php @@ -11,8 +11,6 @@ /** * This interface intercepts calls to the mail() function. * - * @package Swift - * @subpackage Transport * @author Chris Corbyn */ interface Swift_Transport_MailInvoker diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/MailTransport.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/MailTransport.php index 0a0ed27be..cf984d478 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/MailTransport.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/MailTransport.php @@ -19,8 +19,6 @@ * due to limitations of PHP's internal mail() function. You'll get an * all-or-nothing result from sending. * - * @package Swift - * @subpackage Transport * @author Chris Corbyn */ class Swift_Transport_MailTransport implements Swift_Transport @@ -207,8 +205,6 @@ public function registerPlugin(Swift_Events_EventListener $plugin) $this->_eventDispatcher->bindEventListener($plugin); } - // -- Private methods - /** Determine the best-use reverse path for this message */ private function _getReversePath(Swift_Mime_Message $message) { diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/NullTransport.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/NullTransport.php index fcfd9218d..f87cfbf3e 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/NullTransport.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/NullTransport.php @@ -11,7 +11,6 @@ /** * Pretends messages have been sent, but just ignores them. * - * @package Swift * @author Fabien Potencier */ class Swift_Transport_NullTransport implements Swift_Transport diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/SendmailTransport.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/SendmailTransport.php index 9ce748017..8f8eb043f 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/SendmailTransport.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/SendmailTransport.php @@ -15,8 +15,6 @@ * It is advised to use -bs mode since error reporting with -t mode is not * possible. * - * @package Swift - * @subpackage Transport * @author Chris Corbyn */ class Swift_Transport_SendmailTransport extends Swift_Transport_AbstractSmtpTransport @@ -153,8 +151,6 @@ public function send(Swift_Mime_Message $message, &$failedRecipients = null) return $count; } - // -- Protected methods - /** Get the params to initialize the buffer */ protected function _getBufferParams() { diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/SimpleMailInvoker.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/SimpleMailInvoker.php index 0bf6c160a..21e629a64 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/SimpleMailInvoker.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/SimpleMailInvoker.php @@ -11,8 +11,6 @@ /** * This is the implementation class for {@link Swift_Transport_MailInvoker}. * - * @package Swift - * @subpackage Transport * @author Chris Corbyn */ class Swift_Transport_SimpleMailInvoker implements Swift_Transport_MailInvoker diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/SmtpAgent.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/SmtpAgent.php index fcbf5e981..4763b67ec 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/SmtpAgent.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/SmtpAgent.php @@ -11,8 +11,6 @@ /** * Wraps an IoBuffer to send/receive SMTP commands/responses. * - * @package Swift - * @subpackage Transport * @author Chris Corbyn */ interface Swift_Transport_SmtpAgent diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/SpoolTransport.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/SpoolTransport.php index 0fafed72c..6ee9ef5c7 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/SpoolTransport.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/SpoolTransport.php @@ -11,7 +11,6 @@ /** * Stores Messages in a queue. * - * @package Swift * @author Fabien Potencier */ class Swift_Transport_SpoolTransport implements Swift_Transport diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/StreamBuffer.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/StreamBuffer.php index f11e344e6..b36f56e76 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/StreamBuffer.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/StreamBuffer.php @@ -11,8 +11,6 @@ /** * A generic IoBuffer implementation supporting remote sockets and local processes. * - * @package Swift - * @subpackage Transport * @author Chris Corbyn */ class Swift_Transport_StreamBuffer extends Swift_ByteStream_AbstractFilterableInputStream implements Swift_Transport_IoBuffer @@ -215,8 +213,6 @@ public function setReadPointer($byteOffset) { } - // -- Protected methods - /** Flush the stream contents */ protected function _flush() { @@ -247,8 +243,6 @@ protected function _commit($bytes) } } - // -- Private methods - /** * Establishes a connection to a remote server. */ diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/TransportException.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/TransportException.php index 48e41d16d..bdcd23bb9 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/TransportException.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/TransportException.php @@ -11,8 +11,6 @@ /** * TransportException thrown when an error occurs in the Transport subsystem. * - * @package Swift - * @subpackage Transport * @author Chris Corbyn */ class Swift_TransportException extends Swift_IoException diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Validate.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Validate.php index b6906c0b6..2a338bdc7 100755 --- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Validate.php +++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Validate.php @@ -9,7 +9,6 @@ /** * Utility Class allowing users to simply check expressions again Swift Grammar. * - * @package Swift * @author Xavier De Cock */ class Swift_Validate diff --git a/vendor/swiftmailer/swiftmailer/lib/dependency_maps/transport_deps.php b/vendor/swiftmailer/swiftmailer/lib/dependency_maps/transport_deps.php index 56ca0590f..17d63dd1a 100755 --- a/vendor/swiftmailer/swiftmailer/lib/dependency_maps/transport_deps.php +++ b/vendor/swiftmailer/swiftmailer/lib/dependency_maps/transport_deps.php @@ -61,7 +61,7 @@ ->register('transport.plainauth') ->asNewInstanceOf('Swift_Transport_Esmtp_Auth_PlainAuthenticator') - + ->register('transport.xoauth2auth') ->asNewInstanceOf('Swift_Transport_Esmtp_Auth_XOAuth2Authenticator') diff --git a/vendor/swiftmailer/swiftmailer/tests/IdenticalBinaryConstraint.php b/vendor/swiftmailer/swiftmailer/tests/IdenticalBinaryConstraint.php index bcceb2578..95251b4d9 100755 --- a/vendor/swiftmailer/swiftmailer/tests/IdenticalBinaryConstraint.php +++ b/vendor/swiftmailer/swiftmailer/tests/IdenticalBinaryConstraint.php @@ -2,8 +2,6 @@ /** * A binary safe string comparison. - * @package Swift - * @subpackage Tests * @author Chris Corbyn */ class IdenticalBinaryConstraint extends \PHPUnit_Framework_Constraint diff --git a/vendor/swiftmailer/swiftmailer/tests/SwiftMailerSmokeTestCase.php b/vendor/swiftmailer/swiftmailer/tests/SwiftMailerSmokeTestCase.php index cc246cd45..6ff534324 100755 --- a/vendor/swiftmailer/swiftmailer/tests/SwiftMailerSmokeTestCase.php +++ b/vendor/swiftmailer/swiftmailer/tests/SwiftMailerSmokeTestCase.php @@ -3,8 +3,6 @@ /** * Base test for smoke tests. * - * @package Swift - * @subpackage Tests * @author Rouven Weßling */ class SwiftMailerSmokeTestCase extends SwiftMailerTestCase diff --git a/vendor/swiftmailer/swiftmailer/tests/SwiftMailerTestCase.php b/vendor/swiftmailer/swiftmailer/tests/SwiftMailerTestCase.php index 664e90216..365c56a87 100755 --- a/vendor/swiftmailer/swiftmailer/tests/SwiftMailerTestCase.php +++ b/vendor/swiftmailer/swiftmailer/tests/SwiftMailerTestCase.php @@ -2,8 +2,6 @@ /** * A base test case with some custom expectations. - * @package Swift - * @subpackage Tests * @author Rouven Weßling */ class SwiftMailerTestCase extends \PHPUnit_Framework_TestCase diff --git a/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Mime/ContentEncoder/NativeQpContentEncoderAcceptanceTest.php b/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Mime/ContentEncoder/NativeQpContentEncoderAcceptanceTest.php index a477ffa05..777174bdb 100755 --- a/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Mime/ContentEncoder/NativeQpContentEncoderAcceptanceTest.php +++ b/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Mime/ContentEncoder/NativeQpContentEncoderAcceptanceTest.php @@ -79,8 +79,6 @@ public function testGetName() $this->assertSame('quoted-printable', $this->_encoder->getName()); } - // -- Private Methods - private function _createEncoderFromContainer() { return Swift_DependencyContainer::getInstance() diff --git a/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Mime/ContentEncoder/QpContentEncoderAcceptanceTest.php b/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Mime/ContentEncoder/QpContentEncoderAcceptanceTest.php index b29a82f1a..48f421d7f 100755 --- a/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Mime/ContentEncoder/QpContentEncoderAcceptanceTest.php +++ b/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Mime/ContentEncoder/QpContentEncoderAcceptanceTest.php @@ -152,8 +152,6 @@ public function testDotStuffingEncodingAndDecodingSamplesFromDiConfiguredInstanc Swift_Preferences::getInstance()->setQPDotEscape(false); } - // -- Private Methods - private function _createEncoderFromContainer() { return Swift_DependencyContainer::getInstance() diff --git a/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Transport/StreamBuffer/AbstractStreamBufferAcceptanceTest.php b/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Transport/StreamBuffer/AbstractStreamBufferAcceptanceTest.php index c5eb63632..fbc3b5873 100755 --- a/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Transport/StreamBuffer/AbstractStreamBufferAcceptanceTest.php +++ b/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Transport/StreamBuffer/AbstractStreamBufferAcceptanceTest.php @@ -42,7 +42,7 @@ public function testWrite() $this->assertRegExp('/^[0-9]{3}.*?\r\n$/D', $line); $seq = $this->_buffer->write("HELO foo\r\n"); - $this->assertTrue((bool)$seq); + $this->assertTrue((bool) $seq); $line = $this->_buffer->readLine($seq); $this->assertRegExp('/^[0-9]{3}.*?\r\n$/D', $line); diff --git a/vendor/swiftmailer/swiftmailer/tests/bootstrap.php b/vendor/swiftmailer/swiftmailer/tests/bootstrap.php index a5296d5e2..3a6604b41 100755 --- a/vendor/swiftmailer/swiftmailer/tests/bootstrap.php +++ b/vendor/swiftmailer/swiftmailer/tests/bootstrap.php @@ -1,7 +1,5 @@ expects($this->once()) ->method('sendPerformed') ->with($evt) - ->will($this->returnCallback(function($object) { + ->will($this->returnCallback(function ($object) { $object->cancelBubble(true); })); $listenerB->expects($this->never()) @@ -128,8 +128,6 @@ public function testListenersCanCancelBubblingOfEvent() $this->assertTrue($evt->bubbleCancelled()); } - // -- Private methods - private function _createDispatcher(array $map) { return new Swift_Events_SimpleEventDispatcher($map); diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/MailerTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/MailerTest.php index 6efaa1f92..db0b35a06 100755 --- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/MailerTest.php +++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/MailerTest.php @@ -10,13 +10,14 @@ public function testTransportIsStartedWhenSending() $started = false; $transport->shouldReceive('isStarted') ->zeroOrMoreTimes() - ->andReturnUsing(function() use (&$started) { + ->andReturnUsing(function () use (&$started) { return $started; }); $transport->shouldReceive('start') ->once() - ->andReturnUsing(function() use (&$started) { + ->andReturnUsing(function () use (&$started) { $started = true; + return; }); @@ -32,13 +33,14 @@ public function testTransportIsOnlyStartedOnce() $started = false; $transport->shouldReceive('isStarted') ->zeroOrMoreTimes() - ->andReturnUsing(function() use (&$started) { + ->andReturnUsing(function () use (&$started) { return $started; }); $transport->shouldReceive('start') ->once() - ->andReturnUsing(function() use (&$started) { + ->andReturnUsing(function () use (&$started) { $started = true; + return; }); diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/AbstractMimeEntityTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/AbstractMimeEntityTest.php index fe63a7638..3a6658169 100755 --- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/AbstractMimeEntityTest.php +++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/AbstractMimeEntityTest.php @@ -522,7 +522,7 @@ public function testHighestLevelChildDeterminesContentType() $headerSet = $this->_createHeaderSet(array('Content-Type' => $cType)); $headerSet->shouldReceive('newInstance') ->zeroOrMoreTimes() - ->andReturnUsing(function() use ($headerSet) { + ->andReturnUsing(function () use ($headerSet) { return $headerSet; }); $entity = $this->_createEntity($headerSet, @@ -978,8 +978,9 @@ protected function _createEncoder($name = 'quoted-printable', $stub = true) ->will($this->returnValue($name)); $encoder->expects($this->any()) ->method('encodeString') - ->will($this->returnCallback(function() { + ->will($this->returnCallback(function () { $args = func_get_args(); + return array_shift($args); })); @@ -996,12 +997,12 @@ protected function _createHeaderSet($headers = array(), $stub = true) $set = $this->getMockery('Swift_Mime_HeaderSet')->shouldIgnoreMissing(); $set->shouldReceive('get') ->zeroOrMoreTimes() - ->andReturnUsing(function($key) use ($headers) { + ->andReturnUsing(function ($key) use ($headers) { return $headers[$key]; }); $set->shouldReceive('has') ->zeroOrMoreTimes() - ->andReturnUsing(function($key) use ($headers) { + ->andReturnUsing(function ($key) use ($headers) { return array_key_exists($key, $headers); }); @@ -1019,7 +1020,7 @@ protected function _createHeader($name, $model = null, $params = array(), $stub ->andReturn($model); $header->shouldReceive('getParameter') ->zeroOrMoreTimes() - ->andReturnUsing(function($key) use ($params) { + ->andReturnUsing(function ($key) use ($params) { return $params[$key]; }); @@ -1032,13 +1033,14 @@ protected function _createOutputStream($data = null, $stub = true) if (isset($data)) { $os->shouldReceive('read') ->zeroOrMoreTimes() - ->andReturnUsing(function() use ($data) { + ->andReturnUsing(function () use ($data) { static $first = true; if (!$first) { return false; } $first = false; + return $data; }); } diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/AttachmentTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/AttachmentTest.php index fb5824725..c2a15707c 100755 --- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/AttachmentTest.php +++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/AttachmentTest.php @@ -302,13 +302,14 @@ protected function _createFileStream($path, $data, $stub = true) ->andReturn($path); $file->shouldReceive('read') ->zeroOrMoreTimes() - ->andReturnUsing(function() use ($data) { + ->andReturnUsing(function () use ($data) { static $first = true; if (!$first) { return false; } $first = false; + return $data; }); diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/ContentEncoder/Base64ContentEncoderTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/ContentEncoder/Base64ContentEncoderTest.php index 27d0dee93..e1cda85d5 100755 --- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/ContentEncoder/Base64ContentEncoderTest.php +++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/ContentEncoder/Base64ContentEncoderTest.php @@ -311,7 +311,6 @@ public function testFirstLineLengthCanBeDifferent() ); } - // -- Private Methods private function _createOutputByteStream($stub = false) { diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/ContentEncoder/QpContentEncoderTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/ContentEncoder/QpContentEncoderTest.php index 1bdb42db1..b115f18d7 100755 --- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/ContentEncoder/QpContentEncoderTest.php +++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/ContentEncoder/QpContentEncoderTest.php @@ -1,6 +1,5 @@ assertEquals($char, $encodedChar, '%s: Character ' . $char . ' should not be encoded.' ); - } elseif (0x20 == $byte) //Special case - { + } elseif (0x20 == $byte) { //Special case $this->assertEquals('_', $encodedChar, '%s: Space character should be replaced.' ); diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/Headers/DateHeaderTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/Headers/DateHeaderTest.php index 5d912e7e5..0167c71db 100755 --- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/Headers/DateHeaderTest.php +++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/Headers/DateHeaderTest.php @@ -62,8 +62,6 @@ public function testToString() ); } - // -- Private methods - private function _getHeader($name) { return new Swift_Mime_Headers_DateHeader($name, new Swift_Mime_Grammar()); diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/Headers/IdentificationHeaderTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/Headers/IdentificationHeaderTest.php index 73ec28b63..8b6bd1ef3 100755 --- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/Headers/IdentificationHeaderTest.php +++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/Headers/IdentificationHeaderTest.php @@ -182,8 +182,6 @@ public function testStringValue() $this->assertEquals('References: ' . "\r\n", $header->toString()); } - // -- Private methods - private function _getHeader($name) { return new Swift_Mime_Headers_IdentificationHeader($name, new Swift_Mime_Grammar()); diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/Headers/MailboxHeaderTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/Headers/MailboxHeaderTest.php index 5f15b0777..4cfe067b9 100755 --- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/Headers/MailboxHeaderTest.php +++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/Headers/MailboxHeaderTest.php @@ -307,8 +307,6 @@ public function testToString() ); } - // -- Private methods - private function _getHeader($name, $encoder) { $header = new Swift_Mime_Headers_MailboxHeader($name, $encoder, new Swift_Mime_Grammar()); diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/Headers/ParameterizedHeaderTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/Headers/ParameterizedHeaderTest.php index 0018c043f..eb7946b42 100755 --- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/Headers/ParameterizedHeaderTest.php +++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/Headers/ParameterizedHeaderTest.php @@ -1,6 +1,5 @@ assertEquals('test', $header->getFieldBodyModel()); } - // -- Private methods private function _getHeader($name, $encoder) { diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Plugins/ThrottlerPluginTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Plugins/ThrottlerPluginTest.php index 8e227669c..a50f14f9f 100755 --- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Plugins/ThrottlerPluginTest.php +++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Plugins/ThrottlerPluginTest.php @@ -83,7 +83,7 @@ private function _createMessageWithByteCount($bytes) $msg = $this->getMockery('Swift_Mime_Message'); $msg->shouldReceive('toByteStream') ->zeroOrMoreTimes() - ->andReturnUsing(function($is) use ($bytes) { + ->andReturnUsing(function ($is) use ($bytes) { for ($i = 0; $i < $bytes; ++$i) { $is->write('x'); } diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Signers/DKIMSignerTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Signers/DKIMSignerTest.php index 5f6e4dfb3..233110fa3 100755 --- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Signers/DKIMSignerTest.php +++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Signers/DKIMSignerTest.php @@ -99,7 +99,6 @@ public function testSigningRelaxedRelaxed256() $this->assertEquals($sig->getValue(), 'v=1; a=rsa-sha256; bh=f+W+hu8dIhf2VAni89o8lF6WKTXi7nViA4RrMdpD5/U=; d=dummy.nxdomain.be; h=; i=@dummy.nxdomain.be; s=dummySelector; c=relaxed/relaxed; t=1299879181; b=gzOI+PX6HpZKQFzwwmxzcVJsyirdLXOS+4pgfCpVHQIdqYusKLrhlLeFBTNoz75HrhNvGH6T0 Rt3w5aTqkrWfUuAEYt0Ns14GowLM7JojaFN+pZ4eYnRB3CBBgW6fee4NEMD5WPca3uS09tr1E 10RYh9ILlRtl+84sovhx5id3Y='); } - // Relaxed/Simple Hash Signing public function testSigningRelaxedSimple256() { @@ -159,6 +158,7 @@ private function _createHeaderSet() $paramEncoder = new Swift_Encoder_Rfc2231Encoder(new Swift_CharacterStream_ArrayCharacterStream($factory, 'utf-8')); $grammar = new Swift_Mime_Grammar(); $headers = new Swift_Mime_SimpleHeaderSet(new Swift_Mime_SimpleHeaderFactory($headerEncoder, $paramEncoder, $grammar)); + return $headers; } diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Signers/OpenDKIMSignerTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Signers/OpenDKIMSignerTest.php index 245793ae1..00e48c139 100755 --- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Signers/OpenDKIMSignerTest.php +++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Signers/OpenDKIMSignerTest.php @@ -33,7 +33,6 @@ public function testSigningRelaxedRelaxed256() { } - // Relaxed/Simple Hash Signing public function testSigningRelaxedSimple256() { diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/AbstractSmtpEventSupportTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/AbstractSmtpEventSupportTest.php index 44193457b..e68ff2f5d 100755 --- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/AbstractSmtpEventSupportTest.php +++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/AbstractSmtpEventSupportTest.php @@ -440,14 +440,14 @@ public function testCancellingBubbleBeforeTransportStoppedStopsEvent() $dispatcher->shouldReceive('dispatchEvent') ->once() ->with($evt, 'beforeTransportStopped') - ->andReturnUsing(function() use (&$hasRun) { + ->andReturnUsing(function () use (&$hasRun) { $hasRun = true; }); $dispatcher->shouldReceive('dispatchEvent') ->zeroOrMoreTimes(); $evt->shouldReceive('bubbleCancelled') ->zeroOrMoreTimes() - ->andReturnUsing(function() use (&$hasRun) { + ->andReturnUsing(function () use (&$hasRun) { return $hasRun; }); diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/AbstractSmtpTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/AbstractSmtpTest.php index 25031cb42..f98fc0b1b 100755 --- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/AbstractSmtpTest.php +++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/AbstractSmtpTest.php @@ -1174,8 +1174,6 @@ public function testSendingRegeneratesMessageId() $smtp->send($message); } - // -- Protected methods - protected function _getBuffer() { return $this->getMockery('Swift_Transport_IoBuffer')->shouldIgnoreMissing(); diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/Esmtp/AuthHandlerTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/Esmtp/AuthHandlerTest.php index 6157ea30a..64327d478 100755 --- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/Esmtp/AuthHandlerTest.php +++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/Esmtp/AuthHandlerTest.php @@ -1,6 +1,5 @@ shouldReceive('onCommand') ->once() ->with($smtp, "FOO\r\n", array(250, 251), \Mockery::any(), \Mockery::any()) - ->andReturnUsing(function($a, $b, $c, $d, &$e) { + ->andReturnUsing(function ($a, $b, $c, $d, &$e) { $e = true; + return "250 ok"; }); $ext2->shouldReceive('getHandledKeyword') @@ -480,11 +481,11 @@ public function testMixinMethodsBeginningWithSetAndNullReturnAreFluid() $ext1->shouldReceive('setUsername') ->once() ->with('mick') - ->andReturn(NULL); + ->andReturn(null); $ext1->shouldReceive('setPassword') ->once() ->with('pass') - ->andReturn(NULL); + ->andReturn(null); $ext2->shouldReceive('getHandledKeyword') ->zeroOrMoreTimes() ->andReturn('STARTTLS'); diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/FailoverTransportTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/FailoverTransportTest.php index 553bb7b2b..8a90f4d12 100755 --- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/FailoverTransportTest.php +++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/FailoverTransportTest.php @@ -12,12 +12,12 @@ public function testFirstTransportIsUsed() $t1->shouldReceive('isStarted') ->zeroOrMoreTimes() - ->andReturnUsing(function() use (&$connectionState) { + ->andReturnUsing(function () use (&$connectionState) { return $connectionState; }); $t1->shouldReceive('start') ->once() - ->andReturnUsing(function() use (&$connectionState) { + ->andReturnUsing(function () use (&$connectionState) { if (!$connectionState) { $connectionState = true; } @@ -25,7 +25,7 @@ public function testFirstTransportIsUsed() $t1->shouldReceive('send') ->twice() ->with(\Mockery::anyOf($message1, $message2), \Mockery::any()) - ->andReturnUsing(function() use (&$connectionState) { + ->andReturnUsing(function () use (&$connectionState) { if ($connectionState) { return 1; } @@ -51,12 +51,12 @@ public function testMessageCanBeTriedOnNextTransportIfExceptionThrown() $t1->shouldReceive('isStarted') ->zeroOrMoreTimes() - ->andReturnUsing(function() use (&$connectionState1) { + ->andReturnUsing(function () use (&$connectionState1) { return $connectionState1; }); $t1->shouldReceive('start') ->once() - ->andReturnUsing(function() use (&$connectionState1) { + ->andReturnUsing(function () use (&$connectionState1) { if (!$connectionState1) { $connectionState1 = true; } @@ -64,7 +64,7 @@ public function testMessageCanBeTriedOnNextTransportIfExceptionThrown() $t1->shouldReceive('send') ->once() ->with($message, \Mockery::any()) - ->andReturnUsing(function() use (&$connectionState1, $e) { + ->andReturnUsing(function () use (&$connectionState1, $e) { if ($connectionState1) { throw $e; } @@ -72,12 +72,12 @@ public function testMessageCanBeTriedOnNextTransportIfExceptionThrown() $t2->shouldReceive('isStarted') ->zeroOrMoreTimes() - ->andReturnUsing(function() use (&$connectionState2) { + ->andReturnUsing(function () use (&$connectionState2) { return $connectionState2; }); $t2->shouldReceive('start') ->once() - ->andReturnUsing(function() use (&$connectionState2) { + ->andReturnUsing(function () use (&$connectionState2) { if (!$connectionState2) { $connectionState2 = true; } @@ -85,7 +85,7 @@ public function testMessageCanBeTriedOnNextTransportIfExceptionThrown() $t2->shouldReceive('send') ->once() ->with($message, \Mockery::any()) - ->andReturnUsing(function() use (&$connectionState2, $e) { + ->andReturnUsing(function () use (&$connectionState2, $e) { if ($connectionState2) { return 1; } @@ -101,15 +101,15 @@ public function testZeroIsReturnedIfTransportReturnsZero() $message = $this->getMockery('Swift_Mime_Message')->shouldIgnoreMissing(); $t1 = $this->getMockery('Swift_Transport')->shouldIgnoreMissing(); - $connectionState = false; - $t1->shouldReceive('isStarted') + $connectionState = false; + $t1->shouldReceive('isStarted') ->zeroOrMoreTimes() - ->andReturnUsing(function() use (&$connectionState) { + ->andReturnUsing(function () use (&$connectionState) { return $connectionState; }); $t1->shouldReceive('start') ->once() - ->andReturnUsing(function() use (&$connectionState) { + ->andReturnUsing(function () use (&$connectionState) { if (!$connectionState) { $connectionState = true; } @@ -118,10 +118,11 @@ public function testZeroIsReturnedIfTransportReturnsZero() $t1->shouldReceive('send') ->once() ->with($message, \Mockery::any()) - ->andReturnUsing(function() use (&$connectionState, $testCase) { + ->andReturnUsing(function () use (&$connectionState, $testCase) { if (!$connectionState) { $testCase->fail(); } + return 0; }); @@ -145,12 +146,12 @@ public function testTransportsWhichThrowExceptionsAreNotRetried() $t1->shouldReceive('isStarted') ->zeroOrMoreTimes() - ->andReturnUsing(function() use (&$connectionState1) { + ->andReturnUsing(function () use (&$connectionState1) { return $connectionState1; }); $t1->shouldReceive('start') ->once() - ->andReturnUsing(function() use (&$connectionState1) { + ->andReturnUsing(function () use (&$connectionState1) { if (!$connectionState1) { $connectionState1 = true; } @@ -158,7 +159,7 @@ public function testTransportsWhichThrowExceptionsAreNotRetried() $t1->shouldReceive('send') ->once() ->with($message1, \Mockery::any()) - ->andReturnUsing(function() use (&$connectionState1, $e) { + ->andReturnUsing(function () use (&$connectionState1, $e) { if ($connectionState1) { throw $e; } @@ -175,12 +176,12 @@ public function testTransportsWhichThrowExceptionsAreNotRetried() $t2->shouldReceive('isStarted') ->zeroOrMoreTimes() - ->andReturnUsing(function() use (&$connectionState2) { + ->andReturnUsing(function () use (&$connectionState2) { return $connectionState2; }); $t2->shouldReceive('start') ->once() - ->andReturnUsing(function() use (&$connectionState2) { + ->andReturnUsing(function () use (&$connectionState2) { if (!$connectionState2) { $connectionState2 = true; } @@ -188,7 +189,7 @@ public function testTransportsWhichThrowExceptionsAreNotRetried() $t2->shouldReceive('send') ->times(4) ->with(\Mockery::anyOf($message1, $message2, $message3, $message4), \Mockery::any()) - ->andReturnUsing(function() use (&$connectionState2, $e) { + ->andReturnUsing(function () use (&$connectionState2, $e) { if ($connectionState2) { return 1; } @@ -214,12 +215,12 @@ public function testExceptionIsThrownIfAllTransportsDie() $t1->shouldReceive('isStarted') ->zeroOrMoreTimes() - ->andReturnUsing(function() use (&$connectionState1) { + ->andReturnUsing(function () use (&$connectionState1) { return $connectionState1; }); $t1->shouldReceive('start') ->once() - ->andReturnUsing(function() use (&$connectionState1) { + ->andReturnUsing(function () use (&$connectionState1) { if (!$connectionState1) { $connectionState1 = true; } @@ -227,7 +228,7 @@ public function testExceptionIsThrownIfAllTransportsDie() $t1->shouldReceive('send') ->once() ->with($message, \Mockery::any()) - ->andReturnUsing(function() use (&$connectionState1, $e) { + ->andReturnUsing(function () use (&$connectionState1, $e) { if ($connectionState1) { throw $e; } @@ -235,12 +236,12 @@ public function testExceptionIsThrownIfAllTransportsDie() $t2->shouldReceive('isStarted') ->zeroOrMoreTimes() - ->andReturnUsing(function() use (&$connectionState2) { + ->andReturnUsing(function () use (&$connectionState2) { return $connectionState2; }); $t2->shouldReceive('start') ->once() - ->andReturnUsing(function() use (&$connectionState2) { + ->andReturnUsing(function () use (&$connectionState2) { if (!$connectionState2) { $connectionState2 = true; } @@ -248,7 +249,7 @@ public function testExceptionIsThrownIfAllTransportsDie() $t2->shouldReceive('send') ->once() ->with($message, \Mockery::any()) - ->andReturnUsing(function() use (&$connectionState2, $e) { + ->andReturnUsing(function () use (&$connectionState2, $e) { if ($connectionState2) { throw $e; } @@ -273,12 +274,12 @@ public function testStoppingTransportStopsAllDelegates() $t1->shouldReceive('isStarted') ->zeroOrMoreTimes() - ->andReturnUsing(function() use (&$connectionState1) { + ->andReturnUsing(function () use (&$connectionState1) { return $connectionState1; }); $t1->shouldReceive('stop') ->once() - ->andReturnUsing(function() use (&$connectionState1) { + ->andReturnUsing(function () use (&$connectionState1) { if ($connectionState1) { $connectionState1 = false; } @@ -286,12 +287,12 @@ public function testStoppingTransportStopsAllDelegates() $t2->shouldReceive('isStarted') ->zeroOrMoreTimes() - ->andReturnUsing(function() use (&$connectionState2) { + ->andReturnUsing(function () use (&$connectionState2) { return $connectionState2; }); $t2->shouldReceive('stop') ->once() - ->andReturnUsing(function() use (&$connectionState2) { + ->andReturnUsing(function () use (&$connectionState2) { if ($connectionState2) { $connectionState2 = false; } @@ -315,12 +316,12 @@ public function testTransportShowsAsNotStartedIfAllDelegatesDead() $t1->shouldReceive('isStarted') ->zeroOrMoreTimes() - ->andReturnUsing(function() use (&$connectionState1) { + ->andReturnUsing(function () use (&$connectionState1) { return $connectionState1; }); $t1->shouldReceive('start') ->once() - ->andReturnUsing(function() use (&$connectionState1) { + ->andReturnUsing(function () use (&$connectionState1) { if (!$connectionState1) { $connectionState1 = true; } @@ -328,7 +329,7 @@ public function testTransportShowsAsNotStartedIfAllDelegatesDead() $t1->shouldReceive('send') ->once() ->with($message, \Mockery::any()) - ->andReturnUsing(function() use (&$connectionState1, $e) { + ->andReturnUsing(function () use (&$connectionState1, $e) { if ($connectionState1) { $connectionState1 = false; throw $e; @@ -337,12 +338,12 @@ public function testTransportShowsAsNotStartedIfAllDelegatesDead() $t2->shouldReceive('isStarted') ->zeroOrMoreTimes() - ->andReturnUsing(function() use (&$connectionState2) { + ->andReturnUsing(function () use (&$connectionState2) { return $connectionState2; }); $t2->shouldReceive('start') ->once() - ->andReturnUsing(function() use (&$connectionState2) { + ->andReturnUsing(function () use (&$connectionState2) { if (!$connectionState2) { $connectionState2 = true; } @@ -350,7 +351,7 @@ public function testTransportShowsAsNotStartedIfAllDelegatesDead() $t2->shouldReceive('send') ->once() ->with($message, \Mockery::any()) - ->andReturnUsing(function() use (&$connectionState2, $e) { + ->andReturnUsing(function () use (&$connectionState2, $e) { if ($connectionState2) { $connectionState2 = false; throw $e; @@ -382,12 +383,12 @@ public function testRestartingTransportRestartsDeadDelegates() $t1->shouldReceive('isStarted') ->zeroOrMoreTimes() - ->andReturnUsing(function() use (&$connectionState1) { + ->andReturnUsing(function () use (&$connectionState1) { return $connectionState1; }); $t1->shouldReceive('start') ->twice() - ->andReturnUsing(function() use (&$connectionState1) { + ->andReturnUsing(function () use (&$connectionState1) { if (!$connectionState1) { $connectionState1 = true; } @@ -395,7 +396,7 @@ public function testRestartingTransportRestartsDeadDelegates() $t1->shouldReceive('send') ->once() ->with($message1, \Mockery::any()) - ->andReturnUsing(function() use (&$connectionState1, $e) { + ->andReturnUsing(function () use (&$connectionState1, $e) { if ($connectionState1) { $connectionState1 = false; throw $e; @@ -404,7 +405,7 @@ public function testRestartingTransportRestartsDeadDelegates() $t1->shouldReceive('send') ->once() ->with($message2, \Mockery::any()) - ->andReturnUsing(function() use (&$connectionState1) { + ->andReturnUsing(function () use (&$connectionState1) { if ($connectionState1) { return 10; } @@ -412,12 +413,12 @@ public function testRestartingTransportRestartsDeadDelegates() $t2->shouldReceive('isStarted') ->zeroOrMoreTimes() - ->andReturnUsing(function() use (&$connectionState2) { + ->andReturnUsing(function () use (&$connectionState2) { return $connectionState2; }); $t2->shouldReceive('start') ->once() - ->andReturnUsing(function() use (&$connectionState2) { + ->andReturnUsing(function () use (&$connectionState2) { if (!$connectionState2) { $connectionState2 = true; } @@ -425,7 +426,7 @@ public function testRestartingTransportRestartsDeadDelegates() $t2->shouldReceive('send') ->once() ->with($message1, \Mockery::any()) - ->andReturnUsing(function() use (&$connectionState2, $e) { + ->andReturnUsing(function () use (&$connectionState2, $e) { if ($connectionState2) { $connectionState2 = false; throw $e; @@ -461,12 +462,12 @@ public function testFailureReferenceIsPassedToDelegates() $t1->shouldReceive('isStarted') ->zeroOrMoreTimes() - ->andReturnUsing(function() use ($connectionState) { + ->andReturnUsing(function () use ($connectionState) { return $connectionState; }); $t1->shouldReceive('start') ->once() - ->andReturnUsing(function() use ($connectionState) { + ->andReturnUsing(function () use ($connectionState) { if (!$connectionState) { $connectionState = true; } @@ -474,7 +475,7 @@ public function testFailureReferenceIsPassedToDelegates() $t1->shouldReceive('send') ->once() ->with($message, $failures) - ->andReturnUsing(function() use ($connectionState) { + ->andReturnUsing(function () use ($connectionState) { if ($connectionState) { return 1; } diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/LoadBalancedTransportTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/LoadBalancedTransportTest.php index c882f757b..c397cd68f 100755 --- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/LoadBalancedTransportTest.php +++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/LoadBalancedTransportTest.php @@ -14,12 +14,12 @@ public function testEachTransportIsUsedInTurn() $testCase = $this; $t1->shouldReceive('isStarted') ->zeroOrMoreTimes() - ->andReturnUsing(function() use (&$connectionState1) { + ->andReturnUsing(function () use (&$connectionState1) { return $connectionState1; }); $t1->shouldReceive('start') ->once() - ->andReturnUsing(function() use (&$connectionState1) { + ->andReturnUsing(function () use (&$connectionState1) { if (!$connectionState1) { $connectionState1 = true; } @@ -27,7 +27,7 @@ public function testEachTransportIsUsedInTurn() $t1->shouldReceive('send') ->once() ->with($message1, \Mockery::any()) - ->andReturnUsing(function() use (&$connectionState1, $testCase) { + ->andReturnUsing(function () use (&$connectionState1, $testCase) { if ($connectionState1) { return 1; } @@ -39,12 +39,12 @@ public function testEachTransportIsUsedInTurn() $t2->shouldReceive('isStarted') ->zeroOrMoreTimes() - ->andReturnUsing(function() use (&$connectionState2) { + ->andReturnUsing(function () use (&$connectionState2) { return $connectionState2; }); $t2->shouldReceive('start') ->once() - ->andReturnUsing(function() use (&$connectionState2) { + ->andReturnUsing(function () use (&$connectionState2) { if (!$connectionState2) { $connectionState2 = true; } @@ -52,7 +52,7 @@ public function testEachTransportIsUsedInTurn() $t2->shouldReceive('send') ->once() ->with($message2, \Mockery::any()) - ->andReturnUsing(function() use (&$connectionState2, $testCase) { + ->andReturnUsing(function () use (&$connectionState2, $testCase) { if ($connectionState2) { return 1; } @@ -82,12 +82,12 @@ public function testTransportsAreReusedInRotatingFashion() $testCase = $this; $t1->shouldReceive('isStarted') ->zeroOrMoreTimes() - ->andReturnUsing(function() use (&$connectionState1) { + ->andReturnUsing(function () use (&$connectionState1) { return $connectionState1; }); $t1->shouldReceive('start') ->once() - ->andReturnUsing(function() use (&$connectionState1) { + ->andReturnUsing(function () use (&$connectionState1) { if (!$connectionState1) { $connectionState1 = true; } @@ -95,7 +95,7 @@ public function testTransportsAreReusedInRotatingFashion() $t1->shouldReceive('send') ->once() ->with($message1, \Mockery::any()) - ->andReturnUsing(function() use (&$connectionState1, $testCase) { + ->andReturnUsing(function () use (&$connectionState1, $testCase) { if ($connectionState1) { return 1; } @@ -107,7 +107,7 @@ public function testTransportsAreReusedInRotatingFashion() $t1->shouldReceive('send') ->once() ->with($message3, \Mockery::any()) - ->andReturnUsing(function() use (&$connectionState1, $testCase) { + ->andReturnUsing(function () use (&$connectionState1, $testCase) { if ($connectionState1) { return 1; } @@ -119,12 +119,12 @@ public function testTransportsAreReusedInRotatingFashion() $t2->shouldReceive('isStarted') ->zeroOrMoreTimes() - ->andReturnUsing(function() use (&$connectionState2) { + ->andReturnUsing(function () use (&$connectionState2) { return $connectionState2; }); $t2->shouldReceive('start') ->once() - ->andReturnUsing(function() use (&$connectionState2) { + ->andReturnUsing(function () use (&$connectionState2) { if (!$connectionState2) { $connectionState2 = true; } @@ -132,7 +132,7 @@ public function testTransportsAreReusedInRotatingFashion() $t2->shouldReceive('send') ->once() ->with($message2, \Mockery::any()) - ->andReturnUsing(function() use (&$connectionState2, $testCase) { + ->andReturnUsing(function () use (&$connectionState2, $testCase) { if ($connectionState2) { return 1; } @@ -144,7 +144,7 @@ public function testTransportsAreReusedInRotatingFashion() $t2->shouldReceive('send') ->once() ->with($message4, \Mockery::any()) - ->andReturnUsing(function() use (&$connectionState2, $testCase) { + ->andReturnUsing(function () use (&$connectionState2, $testCase) { if ($connectionState2) { return 1; } @@ -176,12 +176,12 @@ public function testMessageCanBeTriedOnNextTransportIfExceptionThrown() $testCase = $this; $t1->shouldReceive('isStarted') ->zeroOrMoreTimes() - ->andReturnUsing(function() use (&$connectionState1) { + ->andReturnUsing(function () use (&$connectionState1) { return $connectionState1; }); $t1->shouldReceive('start') ->once() - ->andReturnUsing(function() use (&$connectionState1) { + ->andReturnUsing(function () use (&$connectionState1) { if (!$connectionState1) { $connectionState1 = true; } @@ -189,7 +189,7 @@ public function testMessageCanBeTriedOnNextTransportIfExceptionThrown() $t1->shouldReceive('send') ->once() ->with($message, \Mockery::any()) - ->andReturnUsing(function() use (&$connectionState1, $e, $testCase) { + ->andReturnUsing(function () use (&$connectionState1, $e, $testCase) { if ($connectionState1) { throw $e; } @@ -198,12 +198,12 @@ public function testMessageCanBeTriedOnNextTransportIfExceptionThrown() $t2->shouldReceive('isStarted') ->zeroOrMoreTimes() - ->andReturnUsing(function() use (&$connectionState2) { + ->andReturnUsing(function () use (&$connectionState2) { return $connectionState2; }); $t2->shouldReceive('start') ->once() - ->andReturnUsing(function() use (&$connectionState2) { + ->andReturnUsing(function () use (&$connectionState2) { if (!$connectionState2) { $connectionState2 = true; } @@ -211,7 +211,7 @@ public function testMessageCanBeTriedOnNextTransportIfExceptionThrown() $t2->shouldReceive('send') ->once() ->with($message, \Mockery::any()) - ->andReturnUsing(function() use (&$connectionState2, $testCase) { + ->andReturnUsing(function () use (&$connectionState2, $testCase) { if ($connectionState2) { return 1; } @@ -233,12 +233,12 @@ public function testMessageIsTriedOnNextTransportIfZeroReturned() $t1->shouldReceive('isStarted') ->zeroOrMoreTimes() - ->andReturnUsing(function() use (&$connectionState1) { + ->andReturnUsing(function () use (&$connectionState1) { return $connectionState1; }); $t1->shouldReceive('start') ->once() - ->andReturnUsing(function() use (&$connectionState1) { + ->andReturnUsing(function () use (&$connectionState1) { if (!$connectionState1) { $connectionState1 = true; } @@ -246,21 +246,22 @@ public function testMessageIsTriedOnNextTransportIfZeroReturned() $t1->shouldReceive('send') ->once() ->with($message, \Mockery::any()) - ->andReturnUsing(function() use (&$connectionState1) { + ->andReturnUsing(function () use (&$connectionState1) { if ($connectionState1) { return 0; } + return 1; }); $t2->shouldReceive('isStarted') ->zeroOrMoreTimes() - ->andReturnUsing(function() use (&$connectionState2) { + ->andReturnUsing(function () use (&$connectionState2) { return $connectionState2; }); $t2->shouldReceive('start') ->once() - ->andReturnUsing(function() use (&$connectionState2) { + ->andReturnUsing(function () use (&$connectionState2) { if (!$connectionState2) { $connectionState2 = true; } @@ -268,10 +269,11 @@ public function testMessageIsTriedOnNextTransportIfZeroReturned() $t2->shouldReceive('send') ->once() ->with($message, \Mockery::any()) - ->andReturnUsing(function() use (&$connectionState2) { + ->andReturnUsing(function () use (&$connectionState2) { if ($connectionState2) { return 1; } + return 0; }); @@ -290,12 +292,12 @@ public function testZeroIsReturnedIfAllTransportsReturnZero() $t1->shouldReceive('isStarted') ->zeroOrMoreTimes() - ->andReturnUsing(function() use (&$connectionState1) { + ->andReturnUsing(function () use (&$connectionState1) { return $connectionState1; }); $t1->shouldReceive('start') ->once() - ->andReturnUsing(function() use (&$connectionState1) { + ->andReturnUsing(function () use (&$connectionState1) { if (!$connectionState1) { $connectionState1 = true; } @@ -303,21 +305,22 @@ public function testZeroIsReturnedIfAllTransportsReturnZero() $t1->shouldReceive('send') ->once() ->with($message, \Mockery::any()) - ->andReturnUsing(function() use (&$connectionState1) { + ->andReturnUsing(function () use (&$connectionState1) { if ($connectionState1) { return 0; } + return 1; }); $t2->shouldReceive('isStarted') ->zeroOrMoreTimes() - ->andReturnUsing(function() use (&$connectionState2) { + ->andReturnUsing(function () use (&$connectionState2) { return $connectionState2; }); $t2->shouldReceive('start') ->once() - ->andReturnUsing(function() use (&$connectionState2) { + ->andReturnUsing(function () use (&$connectionState2) { if (!$connectionState2) { $connectionState2 = true; } @@ -325,10 +328,11 @@ public function testZeroIsReturnedIfAllTransportsReturnZero() $t2->shouldReceive('send') ->once() ->with($message, \Mockery::any()) - ->andReturnUsing(function() use (&$connectionState2) { + ->andReturnUsing(function () use (&$connectionState2) { if ($connectionState2) { return 0; } + return 1; }); @@ -353,12 +357,12 @@ public function testTransportsWhichThrowExceptionsAreNotRetried() $testCase = $this; $t1->shouldReceive('isStarted') ->zeroOrMoreTimes() - ->andReturnUsing(function() use (&$connectionState1) { + ->andReturnUsing(function () use (&$connectionState1) { return $connectionState1; }); $t1->shouldReceive('start') ->once() - ->andReturnUsing(function() use (&$connectionState1) { + ->andReturnUsing(function () use (&$connectionState1) { if (!$connectionState1) { $connectionState1 = true; } @@ -366,7 +370,7 @@ public function testTransportsWhichThrowExceptionsAreNotRetried() $t1->shouldReceive('send') ->once() ->with($message1, \Mockery::any()) - ->andReturnUsing(function() use (&$connectionState1, $e, $testCase) { + ->andReturnUsing(function () use (&$connectionState1, $e, $testCase) { if ($connectionState1) { throw $e; } @@ -384,12 +388,12 @@ public function testTransportsWhichThrowExceptionsAreNotRetried() $t2->shouldReceive('isStarted') ->zeroOrMoreTimes() - ->andReturnUsing(function() use (&$connectionState2) { + ->andReturnUsing(function () use (&$connectionState2) { return $connectionState2; }); $t2->shouldReceive('start') ->once() - ->andReturnUsing(function() use (&$connectionState2) { + ->andReturnUsing(function () use (&$connectionState2) { if (!$connectionState2) { $connectionState2 = true; } @@ -397,7 +401,7 @@ public function testTransportsWhichThrowExceptionsAreNotRetried() $t2->shouldReceive('send') ->times(4) ->with(\Mockery::anyOf($message1, $message3, $message3, $message4), \Mockery::any()) - ->andReturnUsing(function() use (&$connectionState2, $testCase) { + ->andReturnUsing(function () use (&$connectionState2, $testCase) { if ($connectionState2) { return 1; } @@ -424,12 +428,12 @@ public function testExceptionIsThrownIfAllTransportsDie() $t1->shouldReceive('isStarted') ->zeroOrMoreTimes() - ->andReturnUsing(function() use (&$connectionState1) { + ->andReturnUsing(function () use (&$connectionState1) { return $connectionState1; }); $t1->shouldReceive('start') ->once() - ->andReturnUsing(function() use (&$connectionState1) { + ->andReturnUsing(function () use (&$connectionState1) { if (!$connectionState1) { $connectionState1 = true; } @@ -437,7 +441,7 @@ public function testExceptionIsThrownIfAllTransportsDie() $t1->shouldReceive('send') ->once() ->with($message, \Mockery::any()) - ->andReturnUsing(function() use (&$connectionState1, $e) { + ->andReturnUsing(function () use (&$connectionState1, $e) { if ($connectionState1) { throw $e; } @@ -445,12 +449,12 @@ public function testExceptionIsThrownIfAllTransportsDie() $t2->shouldReceive('isStarted') ->zeroOrMoreTimes() - ->andReturnUsing(function() use (&$connectionState2) { + ->andReturnUsing(function () use (&$connectionState2) { return $connectionState2; }); $t2->shouldReceive('start') ->once() - ->andReturnUsing(function() use (&$connectionState2) { + ->andReturnUsing(function () use (&$connectionState2) { if (!$connectionState2) { $connectionState2 = true; } @@ -458,7 +462,7 @@ public function testExceptionIsThrownIfAllTransportsDie() $t2->shouldReceive('send') ->once() ->with($message, \Mockery::any()) - ->andReturnUsing(function() use (&$connectionState2, $e) { + ->andReturnUsing(function () use (&$connectionState2, $e) { if ($connectionState2) { throw $e; } @@ -482,12 +486,12 @@ public function testStoppingTransportStopsAllDelegates() $t1->shouldReceive('isStarted') ->zeroOrMoreTimes() - ->andReturnUsing(function() use (&$connectionState1) { + ->andReturnUsing(function () use (&$connectionState1) { return $connectionState1; }); $t1->shouldReceive('stop') ->once() - ->andReturnUsing(function() use (&$connectionState1) { + ->andReturnUsing(function () use (&$connectionState1) { if ($connectionState1) { $connectionState1 = false; } @@ -495,12 +499,12 @@ public function testStoppingTransportStopsAllDelegates() $t2->shouldReceive('isStarted') ->zeroOrMoreTimes() - ->andReturnUsing(function() use (&$connectionState2) { + ->andReturnUsing(function () use (&$connectionState2) { return $connectionState2; }); $t2->shouldReceive('stop') ->once() - ->andReturnUsing(function() use (&$connectionState2) { + ->andReturnUsing(function () use (&$connectionState2) { if ($connectionState2) { $connectionState2 = false; } @@ -523,12 +527,12 @@ public function testTransportShowsAsNotStartedIfAllDelegatesDead() $t1->shouldReceive('isStarted') ->zeroOrMoreTimes() - ->andReturnUsing(function() use (&$connectionState1) { + ->andReturnUsing(function () use (&$connectionState1) { return $connectionState1; }); $t1->shouldReceive('start') ->once() - ->andReturnUsing(function() use (&$connectionState1) { + ->andReturnUsing(function () use (&$connectionState1) { if (!$connectionState1) { $connectionState1 = true; } @@ -536,7 +540,7 @@ public function testTransportShowsAsNotStartedIfAllDelegatesDead() $t1->shouldReceive('send') ->once() ->with($message, \Mockery::any()) - ->andReturnUsing(function() use (&$connectionState1, $e) { + ->andReturnUsing(function () use (&$connectionState1, $e) { if ($connectionState1) { throw $e; } @@ -544,12 +548,12 @@ public function testTransportShowsAsNotStartedIfAllDelegatesDead() $t2->shouldReceive('isStarted') ->zeroOrMoreTimes() - ->andReturnUsing(function() use (&$connectionState2) { + ->andReturnUsing(function () use (&$connectionState2) { return $connectionState2; }); $t2->shouldReceive('start') ->once() - ->andReturnUsing(function() use (&$connectionState2) { + ->andReturnUsing(function () use (&$connectionState2) { if (!$connectionState2) { $connectionState2 = true; } @@ -557,7 +561,7 @@ public function testTransportShowsAsNotStartedIfAllDelegatesDead() $t2->shouldReceive('send') ->once() ->with($message, \Mockery::any()) - ->andReturnUsing(function() use (&$connectionState2, $e) { + ->andReturnUsing(function () use (&$connectionState2, $e) { if ($connectionState2) { throw $e; } @@ -587,12 +591,12 @@ public function testRestartingTransportRestartsDeadDelegates() $t1->shouldReceive('isStarted') ->zeroOrMoreTimes() - ->andReturnUsing(function() use (&$connectionState1) { + ->andReturnUsing(function () use (&$connectionState1) { return $connectionState1; }); $t1->shouldReceive('start') ->twice() - ->andReturnUsing(function() use (&$connectionState1) { + ->andReturnUsing(function () use (&$connectionState1) { if (!$connectionState1) { $connectionState1 = true; } @@ -600,7 +604,7 @@ public function testRestartingTransportRestartsDeadDelegates() $t1->shouldReceive('send') ->once() ->with($message1, \Mockery::any()) - ->andReturnUsing(function() use (&$connectionState1, $e) { + ->andReturnUsing(function () use (&$connectionState1, $e) { if ($connectionState1) { $connectionState1 = false; throw $e; @@ -609,7 +613,7 @@ public function testRestartingTransportRestartsDeadDelegates() $t1->shouldReceive('send') ->once() ->with($message2, \Mockery::any()) - ->andReturnUsing(function() use (&$connectionState1, $e) { + ->andReturnUsing(function () use (&$connectionState1, $e) { if ($connectionState1) { return 10; } @@ -617,12 +621,12 @@ public function testRestartingTransportRestartsDeadDelegates() $t2->shouldReceive('isStarted') ->zeroOrMoreTimes() - ->andReturnUsing(function() use (&$connectionState2) { + ->andReturnUsing(function () use (&$connectionState2) { return $connectionState2; }); $t2->shouldReceive('start') ->once() - ->andReturnUsing(function() use (&$connectionState2) { + ->andReturnUsing(function () use (&$connectionState2) { if (!$connectionState2) { $connectionState2 = true; } @@ -630,7 +634,7 @@ public function testRestartingTransportRestartsDeadDelegates() $t2->shouldReceive('send') ->once() ->with($message1, \Mockery::any()) - ->andReturnUsing(function() use (&$connectionState2, $e) { + ->andReturnUsing(function () use (&$connectionState2, $e) { if ($connectionState2) { throw $e; } @@ -665,22 +669,22 @@ public function testFailureReferenceIsPassedToDelegates() $t1->shouldReceive('isStarted') ->zeroOrMoreTimes() - ->andReturnUsing(function() use (&$connectionState) { + ->andReturnUsing(function () use (&$connectionState) { return $connectionState; }); $t1->shouldReceive('start') ->once() - ->andReturnUsing(function() use (&$connectionState) { + ->andReturnUsing(function () use (&$connectionState) { if (!$connectionState) { $connectionState = true; } }); $t1->shouldReceive('send') ->once() - ->with($message, \Mockery::on(function(&$var) use (&$failures, $testCase) { + ->with($message, \Mockery::on(function (&$var) use (&$failures, $testCase) { return $testCase->varsAreReferences($var, $failures); })) - ->andReturnUsing(function() use (&$connectionState) { + ->andReturnUsing(function () use (&$connectionState) { if ($connectionState) { return 1; } diff --git a/vendor/symfony/browser-kit/Symfony/Component/BrowserKit/phpunit.xml.dist b/vendor/symfony/browser-kit/Symfony/Component/BrowserKit/phpunit.xml.dist index 8dff1ea1f..51a0f31d1 100755 --- a/vendor/symfony/browser-kit/Symfony/Component/BrowserKit/phpunit.xml.dist +++ b/vendor/symfony/browser-kit/Symfony/Component/BrowserKit/phpunit.xml.dist @@ -1,14 +1,9 @@ - diff --git a/vendor/symfony/console/Symfony/Component/Console/Output/ConsoleOutput.php b/vendor/symfony/console/Symfony/Component/Console/Output/ConsoleOutput.php index b5eaf154f..3560f1c6f 100755 --- a/vendor/symfony/console/Symfony/Component/Console/Output/ConsoleOutput.php +++ b/vendor/symfony/console/Symfony/Component/Console/Output/ConsoleOutput.php @@ -50,7 +50,7 @@ public function __construct($verbosity = self::VERBOSITY_NORMAL, $decorated = nu parent::__construct(fopen($outputStream, 'w'), $verbosity, $decorated, $formatter); - $this->stderr = new StreamOutput(fopen('php://stderr', 'w'), $verbosity, $decorated, $formatter); + $this->stderr = new StreamOutput(fopen('php://stderr', 'w'), $verbosity, $decorated, $this->getFormatter()); } /** diff --git a/vendor/symfony/console/Symfony/Component/Console/Tests/Output/ConsoleOutputTest.php b/vendor/symfony/console/Symfony/Component/Console/Tests/Output/ConsoleOutputTest.php index 7a3ede3ba..1afbbb6e6 100755 --- a/vendor/symfony/console/Symfony/Component/Console/Tests/Output/ConsoleOutputTest.php +++ b/vendor/symfony/console/Symfony/Component/Console/Tests/Output/ConsoleOutputTest.php @@ -20,5 +20,6 @@ public function testConstructor() { $output = new ConsoleOutput(Output::VERBOSITY_QUIET, true); $this->assertEquals(Output::VERBOSITY_QUIET, $output->getVerbosity(), '__construct() takes the verbosity as its first argument'); + $this->assertSame($output->getFormatter(), $output->getErrorOutput()->getFormatter(), '__construct() takes a formatter or null as the third argument'); } } diff --git a/vendor/symfony/console/Symfony/Component/Console/phpunit.xml.dist b/vendor/symfony/console/Symfony/Component/Console/phpunit.xml.dist index 8a7edd46a..13e0f3374 100755 --- a/vendor/symfony/console/Symfony/Component/Console/phpunit.xml.dist +++ b/vendor/symfony/console/Symfony/Component/Console/phpunit.xml.dist @@ -1,14 +1,9 @@ - diff --git a/vendor/symfony/css-selector/Symfony/Component/CssSelector/XPath/Extension/ExtensionInterface.php b/vendor/symfony/css-selector/Symfony/Component/CssSelector/XPath/Extension/ExtensionInterface.php index 65ab28777..223126594 100755 --- a/vendor/symfony/css-selector/Symfony/Component/CssSelector/XPath/Extension/ExtensionInterface.php +++ b/vendor/symfony/css-selector/Symfony/Component/CssSelector/XPath/Extension/ExtensionInterface.php @@ -24,6 +24,8 @@ interface ExtensionInterface /** * Returns node translators. * + * These callables will receive the node as first argument and the translator as second argument. + * * @return callable[] */ public function getNodeTranslators(); diff --git a/vendor/symfony/css-selector/Symfony/Component/CssSelector/XPath/Extension/NodeExtension.php b/vendor/symfony/css-selector/Symfony/Component/CssSelector/XPath/Extension/NodeExtension.php index f86f2b967..d71baaa96 100755 --- a/vendor/symfony/css-selector/Symfony/Component/CssSelector/XPath/Extension/NodeExtension.php +++ b/vendor/symfony/css-selector/Symfony/Component/CssSelector/XPath/Extension/NodeExtension.php @@ -29,11 +29,6 @@ class NodeExtension extends AbstractExtension const ATTRIBUTE_NAME_IN_LOWER_CASE = 2; const ATTRIBUTE_VALUE_IN_LOWER_CASE = 4; - /** - * @var Translator - */ - private $translator; - /** * @var int */ @@ -42,12 +37,10 @@ class NodeExtension extends AbstractExtension /** * Constructor. * - * @param Translator $translator - * @param int $flags + * @param int $flags */ - public function __construct(Translator $translator, $flags = 0) + public function __construct($flags = 0) { - $this->translator = $translator; $this->flags = $flags; } @@ -100,33 +93,36 @@ public function getNodeTranslators() /** * @param Node\SelectorNode $node + * @param Translator $translator * * @return XPathExpr */ - public function translateSelector(Node\SelectorNode $node) + public function translateSelector(Node\SelectorNode $node, Translator $translator) { - return $this->translator->nodeToXPath($node->getTree()); + return $translator->nodeToXPath($node->getTree()); } /** * @param Node\CombinedSelectorNode $node + * @param Translator $translator * * @return XPathExpr */ - public function translateCombinedSelector(Node\CombinedSelectorNode $node) + public function translateCombinedSelector(Node\CombinedSelectorNode $node, Translator $translator) { - return $this->translator->addCombination($node->getCombinator(), $node->getSelector(), $node->getSubSelector()); + return $translator->addCombination($node->getCombinator(), $node->getSelector(), $node->getSubSelector()); } /** * @param Node\NegationNode $node + * @param Translator $translator * * @return XPathExpr */ - public function translateNegation(Node\NegationNode $node) + public function translateNegation(Node\NegationNode $node, Translator $translator) { - $xpath = $this->translator->nodeToXPath($node->getSelector()); - $subXpath = $this->translator->nodeToXPath($node->getSubSelector()); + $xpath = $translator->nodeToXPath($node->getSelector()); + $subXpath = $translator->nodeToXPath($node->getSubSelector()); $subXpath->addNameTest(); if ($subXpath->getCondition()) { @@ -138,34 +134,37 @@ public function translateNegation(Node\NegationNode $node) /** * @param Node\FunctionNode $node + * @param Translator $translator * * @return XPathExpr */ - public function translateFunction(Node\FunctionNode $node) + public function translateFunction(Node\FunctionNode $node, Translator $translator) { - $xpath = $this->translator->nodeToXPath($node->getSelector()); + $xpath = $translator->nodeToXPath($node->getSelector()); - return $this->translator->addFunction($xpath, $node); + return $translator->addFunction($xpath, $node); } /** * @param Node\PseudoNode $node + * @param Translator $translator * * @return XPathExpr */ - public function translatePseudo(Node\PseudoNode $node) + public function translatePseudo(Node\PseudoNode $node, Translator $translator) { - $xpath = $this->translator->nodeToXPath($node->getSelector()); + $xpath = $translator->nodeToXPath($node->getSelector()); - return $this->translator->addPseudoClass($xpath, $node->getIdentifier()); + return $translator->addPseudoClass($xpath, $node->getIdentifier()); } /** * @param Node\AttributeNode $node + * @param Translator $translator * * @return XPathExpr */ - public function translateAttribute(Node\AttributeNode $node) + public function translateAttribute(Node\AttributeNode $node, Translator $translator) { $name = $node->getAttribute(); $safe = $this->isSafeName($name); @@ -181,37 +180,39 @@ public function translateAttribute(Node\AttributeNode $node) $attribute = $safe ? '@'.$name : sprintf('attribute::*[name() = %s]', Translator::getXpathLiteral($name)); $value = $node->getValue(); - $xpath = $this->translator->nodeToXPath($node->getSelector()); + $xpath = $translator->nodeToXPath($node->getSelector()); if ($this->hasFlag(self::ATTRIBUTE_VALUE_IN_LOWER_CASE)) { $value = strtolower($value); } - return $this->translator->addAttributeMatching($xpath, $node->getOperator(), $attribute, $value); + return $translator->addAttributeMatching($xpath, $node->getOperator(), $attribute, $value); } /** * @param Node\ClassNode $node + * @param Translator $translator * * @return XPathExpr */ - public function translateClass(Node\ClassNode $node) + public function translateClass(Node\ClassNode $node, Translator $translator) { - $xpath = $this->translator->nodeToXPath($node->getSelector()); + $xpath = $translator->nodeToXPath($node->getSelector()); - return $this->translator->addAttributeMatching($xpath, '~=', '@class', $node->getName()); + return $translator->addAttributeMatching($xpath, '~=', '@class', $node->getName()); } /** * @param Node\HashNode $node + * @param Translator $translator * * @return XPathExpr */ - public function translateHash(Node\HashNode $node) + public function translateHash(Node\HashNode $node, Translator $translator) { - $xpath = $this->translator->nodeToXPath($node->getSelector()); + $xpath = $translator->nodeToXPath($node->getSelector()); - return $this->translator->addAttributeMatching($xpath, '=', '@id', $node->getId()); + return $translator->addAttributeMatching($xpath, '=', '@id', $node->getId()); } /** diff --git a/vendor/symfony/css-selector/Symfony/Component/CssSelector/XPath/Translator.php b/vendor/symfony/css-selector/Symfony/Component/CssSelector/XPath/Translator.php index 5a8eb9901..4676677ea 100755 --- a/vendor/symfony/css-selector/Symfony/Component/CssSelector/XPath/Translator.php +++ b/vendor/symfony/css-selector/Symfony/Component/CssSelector/XPath/Translator.php @@ -76,7 +76,7 @@ public function __construct(ParserInterface $parser = null) $this->mainParser = $parser ?: new Parser(); $this - ->registerExtension(new Extension\NodeExtension($this)) + ->registerExtension(new Extension\NodeExtension()) ->registerExtension(new Extension\CombinationExtension()) ->registerExtension(new Extension\FunctionExtension()) ->registerExtension(new Extension\PseudoClassExtension()) @@ -207,7 +207,7 @@ public function nodeToXPath(NodeInterface $node) throw new ExpressionErrorException(sprintf('Node "%s" not supported.', $node->getNodeName())); } - return call_user_func($this->nodeTranslators[$node->getNodeName()], $node); + return call_user_func($this->nodeTranslators[$node->getNodeName()], $node, $this); } /** diff --git a/vendor/symfony/css-selector/Symfony/Component/CssSelector/phpunit.xml.dist b/vendor/symfony/css-selector/Symfony/Component/CssSelector/phpunit.xml.dist index a19dc00b3..3eb0a1ece 100755 --- a/vendor/symfony/css-selector/Symfony/Component/CssSelector/phpunit.xml.dist +++ b/vendor/symfony/css-selector/Symfony/Component/CssSelector/phpunit.xml.dist @@ -1,14 +1,9 @@ - diff --git a/vendor/symfony/debug/Symfony/Component/Debug/phpunit.xml.dist b/vendor/symfony/debug/Symfony/Component/Debug/phpunit.xml.dist index 8bab165e1..2a8cb8143 100755 --- a/vendor/symfony/debug/Symfony/Component/Debug/phpunit.xml.dist +++ b/vendor/symfony/debug/Symfony/Component/Debug/phpunit.xml.dist @@ -1,14 +1,9 @@ - diff --git a/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/Crawler.php b/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/Crawler.php index 54b5216ff..0b7200ace 100755 --- a/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/Crawler.php +++ b/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/Crawler.php @@ -674,8 +674,8 @@ public function selectButton($value) { $translate = 'translate(@type, "ABCDEFGHIJKLMNOPQRSTUVWXYZ", "abcdefghijklmnopqrstuvwxyz")'; $xpath = sprintf('descendant-or-self::input[((contains(%s, "submit") or contains(%s, "button")) and contains(concat(\' \', normalize-space(string(@value)), \' \'), %s)) ', $translate, $translate, static::xpathLiteral(' '.$value.' ')). - sprintf('or (contains(%s, "image") and contains(concat(\' \', normalize-space(string(@alt)), \' \'), %s)) or @id="%s" or @name="%s"] ', $translate, static::xpathLiteral(' '.$value.' '), $value, $value). - sprintf('| descendant-or-self::button[contains(concat(\' \', normalize-space(string(.)), \' \'), %s) or @id="%s" or @name="%s"]', static::xpathLiteral(' '.$value.' '), $value, $value); + sprintf('or (contains(%s, "image") and contains(concat(\' \', normalize-space(string(@alt)), \' \'), %s)) or @id=%s or @name=%s] ', $translate, static::xpathLiteral(' '.$value.' '), static::xpathLiteral($value), static::xpathLiteral($value)). + sprintf('| descendant-or-self::button[contains(concat(\' \', normalize-space(string(.)), \' \'), %s) or @id=%s or @name=%s]', static::xpathLiteral(' '.$value.' '), static::xpathLiteral($value), static::xpathLiteral($value)); return $this->filterRelativeXPath($xpath); } diff --git a/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/Link.php b/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/Link.php index 9ddf2b220..bb2302d52 100755 --- a/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/Link.php +++ b/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/Link.php @@ -24,10 +24,12 @@ class Link * @var \DOMElement */ protected $node; + /** * @var string The method to use for the link */ protected $method; + /** * @var string The URI of the page where the link is embedded (or the base href) */ @@ -98,34 +100,23 @@ public function getUri() return $this->currentUri; } - // only an anchor + // an anchor if ('#' === $uri[0]) { - $baseUri = $this->currentUri; - if (false !== $pos = strpos($baseUri, '#')) { - $baseUri = substr($baseUri, 0, $pos); - } - - return $baseUri.$uri; + return $this->cleanupAnchor($this->currentUri).$uri; } - // only a query string - if ('?' === $uri[0]) { - $baseUri = $this->currentUri; - - // remove the query string from the current URI - if (false !== $pos = strpos($baseUri, '?')) { - $baseUri = substr($baseUri, 0, $pos); - } + $baseUri = $this->cleanupUri($this->currentUri); + if ('?' === $uri[0]) { return $baseUri.$uri; } // absolute URL with relative schema if (0 === strpos($uri, '//')) { - return preg_replace('#^([^/]*)//.*$#', '$1', $this->currentUri).$uri; + return preg_replace('#^([^/]*)//.*$#', '$1', $baseUri).$uri; } - $baseUri = preg_replace('#^(.*?//[^/]*)(?:\/.*)?$#', '$1', $this->currentUri); + $baseUri = preg_replace('#^(.*?//[^/]*)(?:\/.*)?$#', '$1', $baseUri); // absolute path if ('/' === $uri[0]) { @@ -194,4 +185,48 @@ protected function setNode(\DOMElement $node) $this->node = $node; } + + /** + * Removes the query string and the anchor from the given uri. + * + * @param string $uri The uri to clean + * + * @return string + */ + private function cleanupUri($uri) + { + return $this->cleanupQuery($this->cleanupAnchor($uri)); + } + + /** + * Remove the query string from the uri. + * + * @param string $uri + * + * @return string + */ + private function cleanupQuery($uri) + { + if (false !== $pos = strpos($uri, '?')) { + return substr($uri, 0, $pos); + } + + return $uri; + } + + /** + * Remove the anchor from the uri. + * + * @param string $uri + * + * @return string + */ + private function cleanupAnchor($uri) + { + if (false !== $pos = strpos($uri, '#')) { + return substr($uri, 0, $pos); + } + + return $uri; + } } diff --git a/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/Tests/CrawlerTest.php b/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/Tests/CrawlerTest.php index 15bcb7dde..37b8d836f 100755 --- a/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/Tests/CrawlerTest.php +++ b/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/Tests/CrawlerTest.php @@ -569,6 +569,48 @@ public function testSelectButton() $this->assertEquals(1, $crawler->selectButton('FooBarName')->count(), '->selectButton() selects buttons with form attribute too'); } + public function testSelectButtonWithSingleQuotesInNameAttribute() + { + $html = << + + +
+ Login +
+
+ +
+ + +HTML; + + $crawler = new Crawler($html); + + $this->assertCount(1, $crawler->selectButton('Click \'Here\'')); + } + + public function testSelectButtonWithDoubleQuotesInNameAttribute() + { + $html = << + + +
+ Login +
+
+ +
+ + +HTML; + + $crawler = new Crawler($html); + + $this->assertCount(1, $crawler->selectButton('Click "Here"')); + } + public function testLink() { $crawler = $this->createTestCrawler('http://example.com/bar/')->selectLink('Foo'); diff --git a/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/Tests/LinkTest.php b/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/Tests/LinkTest.php index a17142830..941e4b2f6 100755 --- a/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/Tests/LinkTest.php +++ b/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/Tests/LinkTest.php @@ -101,7 +101,9 @@ public function getGetUriTests() array('', 'http://localhost/bar/', 'http://localhost/bar/'), array('#', 'http://localhost/bar/', 'http://localhost/bar/#'), + array('#bar', 'http://localhost/bar?a=b', 'http://localhost/bar?a=b#bar'), array('#bar', 'http://localhost/bar/#foo', 'http://localhost/bar/#bar'), + array('?a=b', 'http://localhost/bar#foo', 'http://localhost/bar?a=b'), array('?a=b', 'http://localhost/bar/', 'http://localhost/bar/?a=b'), array('http://login.foo.com/foo', 'http://localhost/bar/', 'http://login.foo.com/foo'), @@ -135,6 +137,8 @@ public function getGetUriTests() array('../../', 'http://localhost/', 'http://localhost/'), array('../../', 'http://localhost', 'http://localhost/'), + array('/foo', 'http://localhost?bar=1', 'http://localhost/foo'), + array('/foo', 'http://localhost#bar', 'http://localhost/foo'), array('/foo', 'file:///', 'file:///foo'), array('/foo', 'file:///bar/baz', 'file:///foo'), array('foo', 'file:///', 'file:///foo'), diff --git a/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/phpunit.xml.dist b/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/phpunit.xml.dist index 0f8d2da75..9be3b45ab 100755 --- a/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/phpunit.xml.dist +++ b/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/phpunit.xml.dist @@ -1,14 +1,9 @@ - diff --git a/vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/phpunit.xml.dist b/vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/phpunit.xml.dist index 0c3de4f7b..a3e430dde 100755 --- a/vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/phpunit.xml.dist +++ b/vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/phpunit.xml.dist @@ -1,6 +1,8 @@ - diff --git a/vendor/symfony/filesystem/Symfony/Component/Filesystem/phpunit.xml.dist b/vendor/symfony/filesystem/Symfony/Component/Filesystem/phpunit.xml.dist index ef0bf9541..790283551 100755 --- a/vendor/symfony/filesystem/Symfony/Component/Filesystem/phpunit.xml.dist +++ b/vendor/symfony/filesystem/Symfony/Component/Filesystem/phpunit.xml.dist @@ -1,14 +1,9 @@ - diff --git a/vendor/symfony/finder/Symfony/Component/Finder/phpunit.xml.dist b/vendor/symfony/finder/Symfony/Component/Finder/phpunit.xml.dist index 23272235b..ccef55ac4 100755 --- a/vendor/symfony/finder/Symfony/Component/Finder/phpunit.xml.dist +++ b/vendor/symfony/finder/Symfony/Component/Finder/phpunit.xml.dist @@ -1,14 +1,9 @@ - diff --git a/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Resources/stubs/FakeFile.php b/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Resources/stubs/FakeFile.php new file mode 100755 index 000000000..0aecc20b0 --- /dev/null +++ b/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Resources/stubs/FakeFile.php @@ -0,0 +1,45 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\HttpFoundation\Resources\stubs; + +use Symfony\Component\HttpFoundation\File\File as OrigFile; + +class FakeFile extends OrigFile +{ + private $realpath; + + public function __construct($realpath, $path) + { + $this->realpath = $realpath; + parent::__construct($path, false); + } + + public function isReadable() + { + return true; + } + + public function getRealpath() + { + return $this->realpath; + } + + public function getSize() + { + return 42; + } + + public function getMTime() + { + return time(); + } +} diff --git a/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Response.php b/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Response.php index 7e548641b..44904acd3 100755 --- a/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Response.php +++ b/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Response.php @@ -270,36 +270,38 @@ public function prepare(Request $request) if ($this->isInformational() || in_array($this->statusCode, array(204, 304))) { $this->setContent(null); - } - - // Content-type based on the Request - if (!$headers->has('Content-Type')) { - $format = $request->getRequestFormat(); - if (null !== $format && $mimeType = $request->getMimeType($format)) { - $headers->set('Content-Type', $mimeType); + $headers->remove('Content-Type'); + $headers->remove('Content-Length'); + } else { + // Content-type based on the Request + if (!$headers->has('Content-Type')) { + $format = $request->getRequestFormat(); + if (null !== $format && $mimeType = $request->getMimeType($format)) { + $headers->set('Content-Type', $mimeType); + } } - } - // Fix Content-Type - $charset = $this->charset ?: 'UTF-8'; - if (!$headers->has('Content-Type')) { - $headers->set('Content-Type', 'text/html; charset='.$charset); - } elseif (0 === stripos($headers->get('Content-Type'), 'text/') && false === stripos($headers->get('Content-Type'), 'charset')) { - // add the charset - $headers->set('Content-Type', $headers->get('Content-Type').'; charset='.$charset); - } + // Fix Content-Type + $charset = $this->charset ?: 'UTF-8'; + if (!$headers->has('Content-Type')) { + $headers->set('Content-Type', 'text/html; charset=' . $charset); + } elseif (0 === stripos($headers->get('Content-Type'), 'text/') && false === stripos($headers->get('Content-Type'), 'charset')) { + // add the charset + $headers->set('Content-Type', $headers->get('Content-Type') . '; charset=' . $charset); + } - // Fix Content-Length - if ($headers->has('Transfer-Encoding')) { - $headers->remove('Content-Length'); - } + // Fix Content-Length + if ($headers->has('Transfer-Encoding')) { + $headers->remove('Content-Length'); + } - if ($request->isMethod('HEAD')) { - // cf. RFC2616 14.13 - $length = $headers->get('Content-Length'); - $this->setContent(null); - if ($length) { - $headers->set('Content-Length', $length); + if ($request->isMethod('HEAD')) { + // cf. RFC2616 14.13 + $length = $headers->get('Content-Length'); + $this->setContent(null); + if ($length) { + $headers->set('Content-Length', $length); + } } } diff --git a/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/BinaryFileResponseTest.php b/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/BinaryFileResponseTest.php index d7d1b03c3..397192b88 100755 --- a/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/BinaryFileResponseTest.php +++ b/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/BinaryFileResponseTest.php @@ -14,6 +14,7 @@ use Symfony\Component\HttpFoundation\BinaryFileResponse; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\ResponseHeaderBag; +use Symfony\Component\HttpFoundation\Resources\stubs\FakeFile; class BinaryFileResponseTest extends ResponseTestCase { @@ -179,18 +180,7 @@ public function testXAccelMapping($realpath, $mapping, $virtual) $request->headers->set('X-Sendfile-Type', 'X-Accel-Redirect'); $request->headers->set('X-Accel-Mapping', $mapping); - $file = $this->getMockBuilder('Symfony\Component\HttpFoundation\File\File') - ->setConstructorArgs(array(__DIR__.'/File/Fixtures/test')) - ->getMock(); - $file->expects($this->any()) - ->method('getRealPath') - ->will($this->returnValue($realpath)); - $file->expects($this->any()) - ->method('isReadable') - ->will($this->returnValue(true)); - $file->expects($this->any()) - ->method('getMTime') - ->will($this->returnValue(time())); + $file = new FakeFile($realpath, __DIR__.'/File/Fixtures/test'); BinaryFileResponse::trustXSendFileTypeHeader(); $response = new BinaryFileResponse($file); diff --git a/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/ResponseTest.php b/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/ResponseTest.php index a84809ad7..77b4ee336 100755 --- a/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/ResponseTest.php +++ b/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/ResponseTest.php @@ -445,11 +445,15 @@ public function testPrepareRemovesContentForInformationalResponse() $response->setStatusCode(101); $response->prepare($request); $this->assertEquals('', $response->getContent()); + $this->assertFalse($response->headers->has('Content-Type')); + $this->assertFalse($response->headers->has('Content-Length')); $response->setContent('content'); $response->setStatusCode(304); $response->prepare($request); $this->assertEquals('', $response->getContent()); + $this->assertFalse($response->headers->has('Content-Type')); + $this->assertFalse($response->headers->has('Content-Length')); } public function testPrepareRemovesContentLength() diff --git a/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/phpunit.xml.dist b/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/phpunit.xml.dist index df11f72c0..bbc5dc6dc 100755 --- a/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/phpunit.xml.dist +++ b/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/phpunit.xml.dist @@ -1,14 +1,9 @@ - diff --git a/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Kernel.php b/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Kernel.php index 694135bfe..781e0cf49 100755 --- a/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Kernel.php +++ b/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Kernel.php @@ -59,11 +59,11 @@ abstract class Kernel implements KernelInterface, TerminableInterface protected $startTime; protected $loadClassCache; - const VERSION = '2.5.1-DEV'; - const VERSION_ID = '20501'; + const VERSION = '2.5.2-DEV'; + const VERSION_ID = '20502'; const MAJOR_VERSION = '2'; const MINOR_VERSION = '5'; - const RELEASE_VERSION = '1'; + const RELEASE_VERSION = '2'; const EXTRA_VERSION = 'DEV'; /** diff --git a/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/Profiler/ProfilerTest.php b/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/Profiler/ProfilerTest.php index bf9724aa2..eee1a3665 100755 --- a/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/Profiler/ProfilerTest.php +++ b/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/Profiler/ProfilerTest.php @@ -79,9 +79,11 @@ protected function setUp() protected function tearDown() { - $this->storage->purge(); - $this->storage = null; + if (null !== $this->storage) { + $this->storage->purge(); + $this->storage = null; - @unlink($this->tmp); + @unlink($this->tmp); + } } } diff --git a/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/phpunit.xml.dist b/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/phpunit.xml.dist index f8490c3f9..a6d1f071f 100755 --- a/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/phpunit.xml.dist +++ b/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/phpunit.xml.dist @@ -1,6 +1,8 @@ - diff --git a/vendor/symfony/process/Symfony/Component/Process/ExecutableFinder.php b/vendor/symfony/process/Symfony/Component/Process/ExecutableFinder.php index 5cc99c769..44f1605fa 100755 --- a/vendor/symfony/process/Symfony/Component/Process/ExecutableFinder.php +++ b/vendor/symfony/process/Symfony/Component/Process/ExecutableFinder.php @@ -53,7 +53,7 @@ public function addSuffix($suffix) public function find($name, $default = null, array $extraDirs = array()) { if (ini_get('open_basedir')) { - $searchPath = explode(PATH_SEPARATOR, getenv('open_basedir')); + $searchPath = explode(PATH_SEPARATOR, ini_get('open_basedir')); $dirs = array(); foreach ($searchPath as $path) { if (is_dir($path)) { diff --git a/vendor/symfony/process/Symfony/Component/Process/ProcessBuilder.php b/vendor/symfony/process/Symfony/Component/Process/ProcessBuilder.php index 40b8d7011..71633cd7f 100755 --- a/vendor/symfony/process/Symfony/Component/Process/ProcessBuilder.php +++ b/vendor/symfony/process/Symfony/Component/Process/ProcessBuilder.php @@ -146,6 +146,17 @@ public function setEnv($name, $value) return $this; } + /** + * Adds a set of environment variables. + * + * Already existing environment variables with the same name will be + * overridden by the new values passed to this method. Pass `null` to unset + * a variable. + * + * @param array $variables The variables + * + * @return ProcessBuilder + */ public function addEnvironmentVariables(array $variables) { $this->env = array_replace($this->env, $variables); @@ -219,7 +230,7 @@ public function setOption($name, $value) /** * Disables fetching output and error output from the underlying process. * - * @return Process + * @return ProcessBuilder */ public function disableOutput() { @@ -231,7 +242,7 @@ public function disableOutput() /** * Enables fetching output and error output from the underlying process. * - * @return Process + * @return ProcessBuilder */ public function enableOutput() { diff --git a/vendor/symfony/process/Symfony/Component/Process/Tests/ExecutableFinderTest.php b/vendor/symfony/process/Symfony/Component/Process/Tests/ExecutableFinderTest.php new file mode 100755 index 000000000..abaa47d8d --- /dev/null +++ b/vendor/symfony/process/Symfony/Component/Process/Tests/ExecutableFinderTest.php @@ -0,0 +1,112 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\Process\Tests; + +use Symfony\Component\Process\ExecutableFinder; + +/** + * @author Chris Smith + */ +class ExecutableFinderTest extends \PHPUnit_Framework_TestCase +{ + private $path; + + public function tearDown() + { + if ($this->path) { + // Restore path if it was changed. + putenv('PATH='.$this->path); + } + } + + private function setPath($path) + { + $this->path = getenv('PATH'); + putenv('PATH='.$path); + } + + public function testFind() + { + if (!defined('PHP_BINARY')) { + $this->markTestSkipped('Requires the PHP_BINARY constant'); + } + + if (ini_get('open_basedir')) { + $this->markTestSkipped('Cannot test when open_basedir is set'); + } + + $this->setPath(dirname(PHP_BINARY)); + + $finder = new ExecutableFinder; + $result = $finder->find(basename(PHP_BINARY)); + + $this->assertEquals($result, PHP_BINARY); + } + + public function testFindWithDefault() + { + if (ini_get('open_basedir')) { + $this->markTestSkipped('Cannot test when open_basedir is set'); + } + + $expected = 'defaultValue'; + + $this->setPath(''); + + $finder = new ExecutableFinder; + $result = $finder->find('foo', $expected); + + $this->assertEquals($expected, $result); + } + + public function testFindWithExtraDirs() + { + if (!defined('PHP_BINARY')) { + $this->markTestSkipped('Requires the PHP_BINARY constant'); + } + + if (ini_get('open_basedir')) { + $this->markTestSkipped('Cannot test when open_basedir is set'); + } + + $this->setPath(''); + + $extraDirs = array(dirname(PHP_BINARY)); + + $finder = new ExecutableFinder; + $result = $finder->find(basename(PHP_BINARY), null, $extraDirs); + + $this->assertEquals(PHP_BINARY, $result); + } + + public function testFindWithOpenBaseDir() + { + if (!defined('PHP_BINARY')) { + $this->markTestSkipped('Requires the PHP_BINARY constant'); + } + + if (defined('PHP_WINDOWS_VERSION_BUILD')) { + $this->markTestSkipped('Cannot run test on windows'); + } + + if (ini_get('open_basedir')) { + $this->markTestSkipped('Cannot test when open_basedir is set'); + } + + ini_set('open_basedir', dirname(PHP_BINARY).PATH_SEPARATOR.'/'); + + $finder = new ExecutableFinder; + $result = $finder->find(basename(PHP_BINARY)); + + $this->assertEquals(PHP_BINARY, $result); + } +} diff --git a/vendor/symfony/process/Symfony/Component/Process/phpunit.xml.dist b/vendor/symfony/process/Symfony/Component/Process/phpunit.xml.dist index 9d5830f9e..fcb230a06 100755 --- a/vendor/symfony/process/Symfony/Component/Process/phpunit.xml.dist +++ b/vendor/symfony/process/Symfony/Component/Process/phpunit.xml.dist @@ -1,14 +1,9 @@ - diff --git a/vendor/symfony/routing/Symfony/Component/Routing/phpunit.xml.dist b/vendor/symfony/routing/Symfony/Component/Routing/phpunit.xml.dist index 830066aab..8cf6352f3 100755 --- a/vendor/symfony/routing/Symfony/Component/Routing/phpunit.xml.dist +++ b/vendor/symfony/routing/Symfony/Component/Routing/phpunit.xml.dist @@ -1,14 +1,9 @@ - diff --git a/vendor/symfony/translation/Symfony/Component/Translation/Loader/PoFileLoader.php b/vendor/symfony/translation/Symfony/Component/Translation/Loader/PoFileLoader.php index 8ba96680a..a1aff1a87 100755 --- a/vendor/symfony/translation/Symfony/Component/Translation/Loader/PoFileLoader.php +++ b/vendor/symfony/translation/Symfony/Component/Translation/Loader/PoFileLoader.php @@ -157,7 +157,7 @@ private function parse($resource) private function addMessage(array &$messages, array $item) { if (is_array($item['translated'])) { - $messages[$item['ids']['singular']] = stripcslashes($item['translated'][0]); + $messages[stripcslashes($item['ids']['singular'])] = stripcslashes($item['translated'][0]); if (isset($item['ids']['plural'])) { $plurals = $item['translated']; // PO are by definition indexed so sort by index. @@ -169,10 +169,10 @@ private function addMessage(array &$messages, array $item) $empties = array_fill(0, $count+1, '-'); $plurals += $empties; ksort($plurals); - $messages[$item['ids']['plural']] = stripcslashes(implode('|', $plurals)); + $messages[stripcslashes($item['ids']['plural'])] = stripcslashes(implode('|', $plurals)); } } elseif (!empty($item['ids']['singular'])) { - $messages[$item['ids']['singular']] = stripcslashes($item['translated']); + $messages[stripcslashes($item['ids']['singular'])] = stripcslashes($item['translated']); } } } diff --git a/vendor/symfony/translation/Symfony/Component/Translation/Tests/Loader/PoFileLoaderTest.php b/vendor/symfony/translation/Symfony/Component/Translation/Tests/Loader/PoFileLoaderTest.php index dc4123c52..87090eb73 100755 --- a/vendor/symfony/translation/Symfony/Component/Translation/Tests/Loader/PoFileLoaderTest.php +++ b/vendor/symfony/translation/Symfony/Component/Translation/Tests/Loader/PoFileLoaderTest.php @@ -69,4 +69,28 @@ public function testLoadEmptyTranslation() $this->assertEquals('en', $catalogue->getLocale()); $this->assertEquals(array(new FileResource($resource)), $catalogue->getResources()); } + + public function testEscapedId() + { + $loader = new PoFileLoader(); + $resource = __DIR__.'/../fixtures/escaped-id.po'; + $catalogue = $loader->load($resource, 'en', 'domain1'); + + $messages = $catalogue->all('domain1'); + $this->assertArrayHasKey('escaped "foo"', $messages); + $this->assertEquals('escaped "bar"', $messages['escaped "foo"']); + } + + public function testEscapedIdPlurals() + { + $loader = new PoFileLoader(); + $resource = __DIR__.'/../fixtures/escaped-id-plurals.po'; + $catalogue = $loader->load($resource, 'en', 'domain1'); + + $messages = $catalogue->all('domain1'); + $this->assertArrayHasKey('escaped "foo"', $messages); + $this->assertArrayHasKey('escaped "foos"', $messages); + $this->assertEquals('escaped "bar"', $messages['escaped "foo"']); + $this->assertEquals('escaped "bar"|escaped "bars"', $messages['escaped "foos"']); + } } diff --git a/vendor/symfony/translation/Symfony/Component/Translation/Tests/fixtures/escaped-id-plurals.po b/vendor/symfony/translation/Symfony/Component/Translation/Tests/fixtures/escaped-id-plurals.po new file mode 100755 index 000000000..c412aa26e --- /dev/null +++ b/vendor/symfony/translation/Symfony/Component/Translation/Tests/fixtures/escaped-id-plurals.po @@ -0,0 +1,10 @@ +msgid "" +msgstr "" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: en\n" + +msgid "escaped \"foo\"" +msgid_plural "escaped \"foos\"" +msgstr[0] "escaped \"bar\"" +msgstr[1] "escaped \"bars\"" diff --git a/vendor/symfony/translation/Symfony/Component/Translation/Tests/fixtures/escaped-id.po b/vendor/symfony/translation/Symfony/Component/Translation/Tests/fixtures/escaped-id.po new file mode 100755 index 000000000..308eadd92 --- /dev/null +++ b/vendor/symfony/translation/Symfony/Component/Translation/Tests/fixtures/escaped-id.po @@ -0,0 +1,8 @@ +msgid "" +msgstr "" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: en\n" + +msgid "escaped \"foo\"" +msgstr "escaped \"bar\"" diff --git a/vendor/symfony/translation/Symfony/Component/Translation/phpunit.xml.dist b/vendor/symfony/translation/Symfony/Component/Translation/phpunit.xml.dist index 1b37f2142..6392d3d55 100755 --- a/vendor/symfony/translation/Symfony/Component/Translation/phpunit.xml.dist +++ b/vendor/symfony/translation/Symfony/Component/Translation/phpunit.xml.dist @@ -1,14 +1,9 @@ -