From f087952553e846ed7118f3a52b827caec6aa934e Mon Sep 17 00:00:00 2001 From: webimpress Date: Wed, 16 Oct 2019 20:23:52 +0100 Subject: [PATCH 1/8] Update mkdocs configuration - remove redundant docs/book/index.html - add Home page title - use nav instead of deprecated pages - remove copyright as it is pulled from template - update page description - use Introduction instead of Intro for page title --- docs/book/index.html | 10 ---------- mkdocs.yml | 9 ++++----- 2 files changed, 4 insertions(+), 15 deletions(-) delete mode 100644 docs/book/index.html diff --git a/docs/book/index.html b/docs/book/index.html deleted file mode 100644 index cf02af5..0000000 --- a/docs/book/index.html +++ /dev/null @@ -1,10 +0,0 @@ -
-
-

zend-mime

- -

Create and parse MIME messages and parts.

- - 
$ composer require zendframework/zend-mime
-
-
- diff --git a/mkdocs.yml b/mkdocs.yml index a635543..bc231e4 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -1,12 +1,11 @@ docs_dir: docs/book site_dir: docs/html -pages: - - index.md - - Intro: intro.md +nav: + - Home: index.md + - Introduction: intro.md - Reference: - Messages: message.md - Parts: part.md site_name: zend-mime -site_description: zend-mime +site_description: "Create and parse MIME messages and parts" repo_url: 'https://github.com/zendframework/zend-mime' -copyright: 'Copyright (c) 2005-2017 Zend Technologies USA Inc.' From dde1e70cf01ddd4e3863e8f9f9c4a28435bd1e1b Mon Sep 17 00:00:00 2001 From: webimpress Date: Wed, 16 Oct 2019 20:24:15 +0100 Subject: [PATCH 2/8] s/slack/chat --- composer.json | 2 +- docs/CONTRIBUTING.md | 2 +- docs/ISSUE_TEMPLATE.md | 2 +- docs/SUPPORT.md | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.json b/composer.json index cb6f390..af24308 100644 --- a/composer.json +++ b/composer.json @@ -12,7 +12,7 @@ "issues": "https://github.com/zendframework/zend-mime/issues", "source": "https://github.com/zendframework/zend-mime", "rss": "https://github.com/zendframework/zend-mime/releases.atom", - "slack": "https://zendframework-slack.herokuapp.com", + "chat": "https://zendframework-slack.herokuapp.com", "forum": "https://discourse.zendframework.com/c/questions/components" }, "require": { diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md index 83600c6..1c2251f 100644 --- a/docs/CONTRIBUTING.md +++ b/docs/CONTRIBUTING.md @@ -7,7 +7,7 @@ read/subscribe to the following resources: - [Coding Standards](https://github.com/zendframework/zend-coding-standard) - [Forums](https://discourse.zendframework.com/c/contributors) - - [Slack](https://zendframework-slack.herokuapp.com) + - [Chat](https://zendframework-slack.herokuapp.com) - [Code of Conduct](CODE_OF_CONDUCT.md) If you are working on new features or refactoring diff --git a/docs/ISSUE_TEMPLATE.md b/docs/ISSUE_TEMPLATE.md index 7b4d3b3..dd66750 100644 --- a/docs/ISSUE_TEMPLATE.md +++ b/docs/ISSUE_TEMPLATE.md @@ -1,5 +1,5 @@ - [ ] I was not able to find an [open](https://github.com/zendframework/zend-mime/issues?q=is%3Aopen) or [closed](https://github.com/zendframework/zend-mime/issues?q=is%3Aclosed) issue matching what I'm seeing. - - [ ] This is not a question. (Questions should be asked on [slack](https://zendframework.slack.com/) ([Signup for Slack here](https://zendframework-slack.herokuapp.com/)) or our [forums](https://discourse.zendframework.com/).) + - [ ] This is not a question. (Questions should be asked on [chat](https://zendframework.slack.com/) ([Signup here](https://zendframework-slack.herokuapp.com/)) or our [forums](https://discourse.zendframework.com/).) Provide a narrative description of what you are trying to accomplish. diff --git a/docs/SUPPORT.md b/docs/SUPPORT.md index a65dc05..31008cd 100644 --- a/docs/SUPPORT.md +++ b/docs/SUPPORT.md @@ -3,13 +3,13 @@ Zend Framework offers three support channels: - For real-time questions, use our - [Slack](https://zendframework-slack.herokuapp.com) + [chat](https://zendframework-slack.herokuapp.com) - For detailed questions (e.g., those requiring examples) use our [forums](https://discourse.zendframework.com/c/questions/components) - To report issues, use this repository's [issue tracker](https://github.com/zendframework/zend-mime/issues/new) -**DO NOT** use the issue tracker to ask questions; use Slack or the forums for +**DO NOT** use the issue tracker to ask questions; use chat or the forums for that. Questions posed to the issue tracker will be closed. When reporting an issue, please include the following details: From de3362830fa1b64892c3eab11e10c3aa8fbd5312 Mon Sep 17 00:00:00 2001 From: webimpress Date: Wed, 16 Oct 2019 20:24:26 +0100 Subject: [PATCH 3/8] Update copyright year in LICENSE.md --- LICENSE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE.md b/LICENSE.md index 63df410..4bc22a4 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,4 +1,4 @@ -Copyright (c) 2005-2017, Zend Technologies USA, Inc. +Copyright (c) 2005-2019, Zend Technologies USA, Inc. All rights reserved. Redistribution and use in source and binary forms, with or without modification, From e6b2a7916399297f69b28398e8a015ae6d54012b Mon Sep 17 00:00:00 2001 From: webimpress Date: Wed, 16 Oct 2019 20:24:34 +0100 Subject: [PATCH 4/8] Update README.md --- README.md | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 34e73cf..c99e213 100644 --- a/README.md +++ b/README.md @@ -7,6 +7,20 @@ by `Zend\Mail` and `Zend\Mime\Message` and may be used by applications requiring MIME support. +## Installation -- File issues at https://github.com/zendframework/zend-mime/issues -- Documentation is at https://docs.zendframework.com/zend-mime/ +Run the following to install this library: + +```bash +$ composer require zendframework/zend-mime +``` + +## Documentation + +Browse the documentation online at https://docs.zendframework.com/zend-mime/ + +## Support + +* [Issues](https://github.com/zendframework/zend-mime/issues/) +* [Chat](https://zendframework-slack.herokuapp.com/) +* [Forum](https://discourse.zendframework.com/) From aa89b7ec932aa0bd6421c20d071e1ac6468f26fa Mon Sep 17 00:00:00 2001 From: webimpress Date: Wed, 16 Oct 2019 20:24:54 +0100 Subject: [PATCH 5/8] Update composer.json - branch-alias section --- composer.json | 7 +++---- composer.lock | 3 ++- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.json b/composer.json index af24308..3911429 100644 --- a/composer.json +++ b/composer.json @@ -42,8 +42,8 @@ }, "extra": { "branch-alias": { - "dev-master": "2.7-dev", - "dev-develop": "2.8-dev" + "dev-master": "2.7.x-dev", + "dev-develop": "2.8.x-dev" } }, "scripts": { @@ -55,6 +55,5 @@ "cs-fix": "phpcbf", "test": "phpunit --colors=always", "test-coverage": "phpunit --colors=always --coverage-clover clover.xml" - }, - "homepage": "https://github.com/zendframework/zend-mime" + } } diff --git a/composer.lock b/composer.lock index 3749d6d..0f28107 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "fe3621b89823f4acc6a677ac231063e0", + "content-hash": "27a40e1f2a7624a8be3444d024f75563", "packages": [ { "name": "zendframework/zend-stdlib", @@ -882,6 +882,7 @@ "mock", "xunit" ], + "abandoned": true, "time": "2017-08-03T14:08:16+00:00" }, { From 62783e42eefc31535ef67ca7d5439246596e3f3c Mon Sep 17 00:00:00 2001 From: webimpress Date: Wed, 16 Oct 2019 20:26:46 +0100 Subject: [PATCH 6/8] Update copyright/license headers in files --- src/Decode.php | 8 +++----- src/Exception/ExceptionInterface.php | 8 +++----- src/Exception/InvalidArgumentException.php | 8 +++----- src/Exception/RuntimeException.php | 8 +++----- src/Message.php | 8 +++----- src/Mime.php | 8 +++----- src/Part.php | 8 +++----- test/MessageTest.php | 8 +++----- test/MimeTest.php | 8 +++----- test/PartTest.php | 8 +++----- 10 files changed, 30 insertions(+), 50 deletions(-) diff --git a/src/Decode.php b/src/Decode.php index a104ce8..491a261 100644 --- a/src/Decode.php +++ b/src/Decode.php @@ -1,10 +1,8 @@ Date: Wed, 16 Oct 2019 20:28:12 +0100 Subject: [PATCH 7/8] Formatting fix --- src/Decode.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/Decode.php b/src/Decode.php index 491a261..f74ee11 100644 --- a/src/Decode.php +++ b/src/Decode.php @@ -78,8 +78,10 @@ public static function splitMessageStruct($message, $boundary, $EOL = Mime::LINE $body = null; // "Declare" variable before the first usage "for reading" foreach ($parts as $part) { static::splitMessage($part, $headers, $body, $EOL); - $result[] = ['header' => $headers, - 'body' => $body ]; + $result[] = [ + 'header' => $headers, + 'body' => $body, + ]; } return $result; } @@ -94,7 +96,7 @@ public static function splitMessageStruct($message, $boundary, $EOL = Mime::LINE * @param Headers $headers output param, headers container * @param string $body output param, content of message * @param string $EOL EOL string; defaults to {@link Zend\Mime\Mime::LINEEND} - * @param bool $strict enable strict mode for parsing message + * @param bool $strict enable strict mode for parsing message * @return null */ public static function splitMessage($message, &$headers, &$body, $EOL = Mime::LINEEND, $strict = false) From d529bda47713b46c367eb4b3250051e6fa1e1498 Mon Sep 17 00:00:00 2001 From: webimpress Date: Wed, 16 Oct 2019 20:28:20 +0100 Subject: [PATCH 8/8] release: 2.7.2 readiness --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6a1c2a5..ac7a52b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ All notable changes to this project will be documented in this file, in reverse chronological order by release. -## 2.7.2 - TBD +## 2.7.2 - 2019-10-16 ### Added