Version 1.0.0

php-telegram-bot · May 8, 2017 · b4485ae · b4485ae
2 parents bd324c2 + a6b49d2
commit b4485ae
Show file tree

Hide file tree

Showing 17 changed files with 99 additions and 99 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,11 @@ Exclamation symbols (:exclamation:) note something of importance e.g. breaking c
 ### Fixed
 ### Security
 
+## [1.0.0] - 2017-05-08
+### Changed
+- [:exclamation:][1.0.0-bc-move] Move to `php-telegram-bot/telegram-bot-manager` on packagist.
+- [:exclamation:][1.0.0-bc-move] Move to `TelegramBot\TelegramBotManager` namespace.
+
 ## [0.44.0] - 2017-05-05
 ### Added
 - Ability to define custom valid IPs to access webhook.
@@ -77,4 +82,5 @@ Exclamation symbols (:exclamation:) note something of importance e.g. breaking c
 ### Added
 - First minor version that contains the basic functionality.
 
+[1.0.0-bc-move]: https://github.com/php-telegram-bot/telegram-bot-manager/wiki/Breaking-backwards-compatibility#namespace-and-package-name-changed "Namespace and package name changed"
 [0.44.0-bc-parameter-structure]: https://github.com/php-telegram-bot/telegram-bot-manager/wiki/Breaking-backwards-compatibility#parameter-structure-changed "Parameter structure changed"
diff --git a/README.md b/README.md
@@ -20,16 +20,16 @@ Installation and usage is pretty straight forward:
 Either run this command in your command line:
 
 ```bash
-composer require noplanman/telegram-bot-manager:^0.44
+composer require php-telegram-bot/telegram-bot-manager:^1.0
 ```
 
 **or**
 
-For existing Composer projects, edit your project's `composer.json` file to require `noplanman/telegram-bot-manager`:
+For existing Composer projects, edit your project's `composer.json` file to require `php-telegram-bot/telegram-bot-manager`:
 
 ```yaml
 "require": {
-    "noplanman/telegram-bot-manager": "^0.44"
+    "php-telegram-bot/telegram-bot-manager": "^1.0"
 }
 ```
 and then run `composer update`
@@ -42,7 +42,7 @@ It is possible however, to override the core version that this library requires:
 
 ```yaml
 "require": {
-    "noplanman/telegram-bot-manager": "^0.44",
+    "php-telegram-bot/telegram-bot-manager": "^1.0",
     "longman/telegram-bot": "dev-develop as 0.44"
 }
 ```
@@ -133,7 +133,7 @@ Let's start off with a simple example that uses the webhook method:
 ```php
 <?php
 
-use NPM\TelegramBotManager\BotManager;
+use TelegramBot\TelegramBotManager\BotManager;
 
 // Load composer.
 require_once __DIR__ . '/vendor/autoload.php';
@@ -308,12 +308,12 @@ $bot = new BotManager([
 
 ### Using getUpdates method
 
-Using the `getUpdates` method requires a MySQL database connection:
+Using the `getUpdates` method must not have a `webhook` parameter set and requires a MySQL database connection:
 ```php
 $bot = new BotManager([
     ...
     // Extras.
-    'mysql'   => [
+    'mysql' => [
         'host'     => '127.0.0.1',
         'user'     => 'root',
         'password' => 'root',
@@ -337,7 +337,7 @@ It probably makes sense for you to create a new dummy bot for this.
 [github-tgbot-core]: https://github.com/php-telegram-bot/core "PHP Telegram Bot on GitHub"
 [github-tgbot-core-instructions]: https://github.com/php-telegram-bot/core#instructions "PHP Telegram Bot instructions on GitHub"
 [github-tgbot-manager]: https://github.com/php-telegram-bot/telegram-bot-manager "PHP Telegram Bot Manager on GitHub"
-[packagist-tgbot-manager]: https://packagist.org/packages/noplanman/telegram-bot-manager "PHP Telegram Bot Manager on Packagist"
+[packagist-tgbot-manager]: https://packagist.org/packages/php-telegram-bot/telegram-bot-manager "PHP Telegram Bot Manager on Packagist"
 [license]: https://github.com/php-telegram-bot/telegram-bot-manager/blob/master/LICENSE "PHP Telegram Bot Manager license"
 
 [code-quality-badge]: https://img.shields.io/scrutinizer/g/php-telegram-bot/telegram-bot-manager.svg
@@ -347,9 +347,9 @@ It probably makes sense for you to create a new dummy bot for this.
 [build-status-badge]: https://img.shields.io/travis/php-telegram-bot/telegram-bot-manager.svg
 [build-status]: https://travis-ci.org/php-telegram-bot/telegram-bot-manager "Build status on Travis-CI"
 
-[latest-version-badge]: https://img.shields.io/packagist/v/noplanman/telegram-bot-manager.svg
-[total-downloads-badge]: https://img.shields.io/packagist/dt/noplanman/telegram-bot-manager.svg
-[license-badge]: https://img.shields.io/packagist/l/noplanman/telegram-bot-manager.svg
+[latest-version-badge]: https://img.shields.io/packagist/v/php-telegram-bot/telegram-bot-manager.svg
+[total-downloads-badge]: https://img.shields.io/packagist/dt/php-telegram-bot/telegram-bot-manager.svg
+[license-badge]: https://img.shields.io/packagist/l/php-telegram-bot/telegram-bot-manager.svg
 
 [random-characters]: https://www.random.org/strings/?num=7&len=12&digits=on&upperalpha=on&loweralpha=on&unique=on&format=plain&rnd=new "Generate random characters"
 [travis-repository-settings]: https://docs.travis-ci.com/user/environment-variables#Defining-Variables-in-Repository-Settings "Repository Settings on Travis-CI"

diff --git a/composer.json b/composer.json
@@ -1,13 +1,13 @@
 {
-    "name": "noplanman/telegram-bot-manager",
+    "name": "php-telegram-bot/telegram-bot-manager",
     "type": "library",
     "description": "PHP Telegram Bot Manager",
     "keywords": ["telegram", "bot", "manager"],
     "license": "MIT",
-    "homepage": "https://github.com/noplanman/php-telegram-bot-manager",
+    "homepage": "https://github.com/php-telegram-bot/telegram-bot-manager",
     "support": {
-        "issues": "https://github.com/noplanman/php-telegram-bot-manager/issues",
-        "source": "https://github.com/noplanman/php-telegram-bot-manager"
+        "issues": "https://github.com/php-telegram-bot/telegram-bot-manager/issues",
+        "source": "https://github.com/php-telegram-bot/telegram-bot-manager"
     },
     "authors": [
         {
@@ -31,16 +31,16 @@
     "require-dev": {
         "jakub-onderka/php-parallel-lint": "^0.9.2",
         "phpunit/phpunit": "^6.1",
-        "squizlabs/php_codesniffer": "^2.8"
+        "squizlabs/php_codesniffer": "^2.9"
     },
     "autoload": {
         "psr-4": {
-            "NPM\\TelegramBotManager\\": "src"
+            "TelegramBot\\TelegramBotManager\\": "src"
         }
     },
     "autoload-dev": {
         "psr-4": {
-            "NPM\\TelegramBotManager\\Tests\\": "tests/TelegramBotManager/Tests"
+            "TelegramBot\\TelegramBotManager\\Tests\\": "tests"
         }
     },
     "scripts": {

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,21 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="tests/bootstrap.php" colors="true">
+<phpunit bootstrap="vendor/autoload.php"
+         backupGlobals="false"
+         backupStaticAttributes="false"
+         beStrictAboutOutputDuringTests="true"
+         colors="true"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         processIsolation="false"
+         stopOnError="false"
+         stopOnFailure="false"
+         verbose="true"
+>
     <testsuites>
         <testsuite name="TelegramBotManager Test Suite">
-            <directory>tests/</directory>
+            <directory suffix="Test.php">tests/</directory>
         </testsuite>
     </testsuites>
 
     <filter>
-        <whitelist>
+        <whitelist processUncoveredFilesFromWhitelist="true">
             <directory suffix=".php">src/</directory>
         </whitelist>
     </filter>
 
     <php>
         <ini name="date.timezone" value="UTC"/>
-        <ini name="error_reporting" value="-1" />
-        <const name="PHPUNIT_TEST" value="true" />
+        <ini name="error_reporting" value="-1"/>
+        <const name="PHPUNIT_TEST" value="true"/>
         <const name="PHPUNIT_DB_HOST" value="127.0.0.1"/>
         <const name="PHPUNIT_DB_USER" value="root"/>
         <const name="PHPUNIT_DB_PASSWORD" value=""/>

diff --git a/src/Action.php b/src/Action.php
@@ -8,9 +8,9 @@
  * file that was distributed with this source code.
  */
 
-namespace NPM\TelegramBotManager;
+namespace TelegramBot\TelegramBotManager;
 
-use NPM\TelegramBotManager\Exception\InvalidActionException;
+use TelegramBot\TelegramBotManager\Exception\InvalidActionException;
 
 class Action
 {
@@ -35,7 +35,7 @@ class Action
      *
      * @param string $action
      *
-     * @throws \NPM\TelegramBotManager\Exception\InvalidActionException
+     * @throws \TelegramBot\TelegramBotManager\Exception\InvalidActionException
      */
     public function __construct($action = 'handle')
     {

diff --git a/src/BotManager.php b/src/BotManager.php
@@ -8,15 +8,15 @@
  * file that was distributed with this source code.
  */
 
-namespace NPM\TelegramBotManager;
+namespace TelegramBot\TelegramBotManager;
 
 use Allty\Utils\IpTools;
 use Longman\TelegramBot\Entities;
 use Longman\TelegramBot\Request;
 use Longman\TelegramBot\Telegram;
 use Longman\TelegramBot\TelegramLog;
-use NPM\TelegramBotManager\Exception\InvalidAccessException;
-use NPM\TelegramBotManager\Exception\InvalidWebhookException;
+use TelegramBot\TelegramBotManager\Exception\InvalidAccessException;
+use TelegramBot\TelegramBotManager\Exception\InvalidWebhookException;
 
 class BotManager
 {
@@ -36,12 +36,12 @@ class BotManager
     private $telegram;
 
     /**
-     * @var \NPM\TelegramBotManager\Params Object that manages the parameters.
+     * @var \TelegramBot\TelegramBotManager\Params Object that manages the parameters.
      */
     private $params;
 
     /**
-     * @var \NPM\TelegramBotManager\Action Object that contains the current action.
+     * @var \TelegramBot\TelegramBotManager\Action Object that contains the current action.
      */
     private $action;
 
@@ -50,8 +50,8 @@ class BotManager
      *
      * @param array $params
      *
-     * @throws \NPM\TelegramBotManager\Exception\InvalidParamsException
-     * @throws \NPM\TelegramBotManager\Exception\InvalidActionException
+     * @throws \TelegramBot\TelegramBotManager\Exception\InvalidParamsException
+     * @throws \TelegramBot\TelegramBotManager\Exception\InvalidActionException
      * @throws \Longman\TelegramBot\Exception\TelegramException
      */
     public function __construct(array $params)
@@ -92,7 +92,7 @@ public function getTelegram(): Telegram
     /**
      * Get the Params object.
      *
-     * @return \NPM\TelegramBotManager\Params
+     * @return \TelegramBot\TelegramBotManager\Params
      */
     public function getParams(): Params
     {
@@ -102,7 +102,7 @@ public function getParams(): Params
     /**
      * Get the Action object.
      *
-     * @return \NPM\TelegramBotManager\Action
+     * @return \TelegramBot\TelegramBotManager\Action
      */
     public function getAction(): Action
     {
@@ -112,10 +112,10 @@ public function getAction(): Action
     /**
      * Run this thing in all its glory!
      *
-     * @return \NPM\TelegramBotManager\BotManager
+     * @return \TelegramBot\TelegramBotManager\BotManager
      * @throws \Longman\TelegramBot\Exception\TelegramException
-     * @throws \NPM\TelegramBotManager\Exception\InvalidAccessException
-     * @throws \NPM\TelegramBotManager\Exception\InvalidWebhookException
+     * @throws \TelegramBot\TelegramBotManager\Exception\InvalidAccessException
+     * @throws \TelegramBot\TelegramBotManager\Exception\InvalidWebhookException
      * @throws \Exception
      */
     public function run(): self
@@ -145,7 +145,7 @@ public function run(): self
      *
      * @param array $log_paths
      *
-     * @return \NPM\TelegramBotManager\BotManager
+     * @return \TelegramBot\TelegramBotManager\BotManager
      * @throws \Exception
      */
     public function initLogging(array $log_paths): self
@@ -164,8 +164,8 @@ public function initLogging(array $log_paths): self
      *
      * @param bool $force Force validation, even on CLI.
      *
-     * @return \NPM\TelegramBotManager\BotManager
-     * @throws \NPM\TelegramBotManager\Exception\InvalidAccessException
+     * @return \TelegramBot\TelegramBotManager\BotManager
+     * @throws \TelegramBot\TelegramBotManager\Exception\InvalidAccessException
      */
     public function validateSecret(bool $force = false): self
     {
@@ -184,9 +184,9 @@ public function validateSecret(bool $force = false): self
     /**
      * Make sure the webhook is valid and perform the requested webhook operation.
      *
-     * @return \NPM\TelegramBotManager\BotManager
+     * @return \TelegramBot\TelegramBotManager\BotManager
      * @throws \Longman\TelegramBot\Exception\TelegramException
-     * @throws \NPM\TelegramBotManager\Exception\InvalidWebhookException
+     * @throws \TelegramBot\TelegramBotManager\Exception\InvalidWebhookException
      */
     public function validateAndSetWebhook(): self
     {
@@ -224,7 +224,7 @@ public function validateAndSetWebhook(): self
      *
      * @param string $output
      *
-     * @return \NPM\TelegramBotManager\BotManager
+     * @return \TelegramBot\TelegramBotManager\BotManager
      */
     private function handleOutput(string $output): self
     {
@@ -240,7 +240,7 @@ private function handleOutput(string $output): self
     /**
      * Set any extra bot features that have been assigned on construction.
      *
-     * @return \NPM\TelegramBotManager\BotManager
+     * @return \TelegramBot\TelegramBotManager\BotManager
      * @throws \Longman\TelegramBot\Exception\TelegramException
      */
     public function setBotExtras(): self
@@ -254,7 +254,7 @@ public function setBotExtras(): self
     /**
      * Set extra bot parameters for Telegram object.
      *
-     * @return \NPM\TelegramBotManager\BotManager
+     * @return \TelegramBot\TelegramBotManager\BotManager
      * @throws \Longman\TelegramBot\Exception\TelegramException
      */
     protected function setBotExtrasTelegram(): self
@@ -293,7 +293,7 @@ protected function setBotExtrasTelegram(): self
     /**
      * Set extra bot parameters for Request class.
      *
-     * @return \NPM\TelegramBotManager\BotManager
+     * @return \TelegramBot\TelegramBotManager\BotManager
      * @throws \Longman\TelegramBot\Exception\TelegramException
      */
     protected function setBotExtrasRequest(): self
@@ -322,8 +322,8 @@ protected function setBotExtrasRequest(): self
     /**
      * Handle the request, which calls either the Webhook or getUpdates method respectively.
      *
-     * @return \NPM\TelegramBotManager\BotManager
-     * @throws \NPM\TelegramBotManager\Exception\InvalidAccessException
+     * @return \TelegramBot\TelegramBotManager\BotManager
+     * @throws \TelegramBot\TelegramBotManager\Exception\InvalidAccessException
      * @throws \Longman\TelegramBot\Exception\TelegramException
      */
     public function handleRequest(): self
@@ -344,7 +344,7 @@ public function handleRequest(): self
     /**
      * Handle cron.
      *
-     * @return \NPM\TelegramBotManager\BotManager
+     * @return \TelegramBot\TelegramBotManager\BotManager
      * @throws \Longman\TelegramBot\Exception\TelegramException
      */
     public function handleCron(): self
@@ -403,7 +403,7 @@ public function getLoopInterval(): int
      * @param int $loop_time_in_seconds
      * @param int $loop_interval_in_seconds
      *
-     * @return \NPM\TelegramBotManager\BotManager
+     * @return \TelegramBot\TelegramBotManager\BotManager
      * @throws \Longman\TelegramBot\Exception\TelegramException
      */
     public function handleGetUpdatesLoop(int $loop_time_in_seconds, int $loop_interval_in_seconds = 2): self
@@ -426,7 +426,7 @@ public function handleGetUpdatesLoop(int $loop_time_in_seconds, int $loop_interv
     /**
      * Handle the updates using the getUpdates method.
      *
-     * @return \NPM\TelegramBotManager\BotManager
+     * @return \TelegramBot\TelegramBotManager\BotManager
      * @throws \Longman\TelegramBot\Exception\TelegramException
      */
     public function handleGetUpdates(): self
@@ -473,9 +473,9 @@ public function handleGetUpdates(): self
     /**
      * Handle the updates using the Webhook method.
      *
-     * @return \NPM\TelegramBotManager\BotManager
+     * @return \TelegramBot\TelegramBotManager\BotManager
      * @throws \Longman\TelegramBot\Exception\TelegramException
-     * @throws \NPM\TelegramBotManager\Exception\InvalidAccessException
+     * @throws \TelegramBot\TelegramBotManager\Exception\InvalidAccessException
      */
     public function handleWebhook(): self
     {

diff --git a/src/Exception/BotManagerException.php b/src/Exception/BotManagerException.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-namespace NPM\TelegramBotManager\Exception;
+namespace TelegramBot\TelegramBotManager\Exception;
 
 class BotManagerException extends \Exception
 {