Procházet zdrojové kódy

添加 lcobucci/jwt "^3.3.0" 及 mikemadisonweb/yii2-rabbitmq “^2.2.1”

shishao-home před 6 roky
rodič
revize
09e18941ef

+ 2 - 1
.bowerrc

@@ -1,3 +1,4 @@
 {
-    "directory" : "vendor/bower"
+    "directory" : "vendor/bower",
+    "registry"  : "https://registry.bower.io"
 }

+ 2 - 1
composer.json

@@ -25,7 +25,8 @@
         "jzweb/open-weixin": "*",
         "pwf0112/wxcrypt": "*",
         "hollisho/yii2-redis-pub-sub": "dev-master",
-        "mikemadisonweb/yii2-rabbitmq": "^2.2.0"
+        "mikemadisonweb/yii2-rabbitmq": "^2.2.1",
+        "lcobucci/jwt": "^3.3.0"
     },
     "require-dev": {
         "yiisoft/yii2-codeception": "~2.0.5",

+ 69 - 9
composer.lock

@@ -1,10 +1,10 @@
 {
     "_readme": [
         "This file locks the dependencies of your project to a known state",
-        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
+        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "686bdb6e9d780bb979f12aa4131deeb7",
+    "content-hash": "e176081a1f4f4a8ff703c12a9329afeb",
     "packages": [
         {
             "name": "aliyuncs/oss-sdk-php",
@@ -667,6 +667,67 @@
             "description": "微信开放平台接口",
             "time": "2018-06-01T07:58:00+00:00"
         },
+        {
+            "name": "lcobucci/jwt",
+            "version": "3.4.x-dev",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/lcobucci/jwt.git",
+                "reference": "a11ec5f4b4d75d1fcd04e133dede4c317aac9e18"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/lcobucci/jwt/zipball/a11ec5f4b4d75d1fcd04e133dede4c317aac9e18",
+                "reference": "a11ec5f4b4d75d1fcd04e133dede4c317aac9e18",
+                "shasum": "",
+                "mirrors": [
+                    {
+                        "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
+                        "preferred": true
+                    }
+                ]
+            },
+            "require": {
+                "ext-mbstring": "*",
+                "ext-openssl": "*",
+                "php": "^5.6 || ^7.0"
+            },
+            "require-dev": {
+                "mikey179/vfsstream": "~1.5",
+                "phpmd/phpmd": "~2.2",
+                "phpunit/php-invoker": "~1.1",
+                "phpunit/phpunit": "^5.7 || ^7.3",
+                "squizlabs/php_codesniffer": "~2.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.1-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Lcobucci\\JWT\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Luís Otávio Cobucci Oblonczyk",
+                    "email": "lcobucci@gmail.com",
+                    "role": "Developer"
+                }
+            ],
+            "description": "A simple library to work with JSON Web Token and JSON Web Signature",
+            "keywords": [
+                "JWS",
+                "jwt"
+            ],
+            "time": "2019-05-24 18:30:49"
+        },
         {
             "name": "linslin/yii2-curl",
             "version": "1.0.11",
@@ -718,16 +779,16 @@
         },
         {
             "name": "mikemadisonweb/yii2-rabbitmq",
-            "version": "dev-master",
+            "version": "2.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/mikemadisonweb/yii2-rabbitmq.git",
-                "reference": "8bd72d8ba00862e71171e26f770ecc4676bd532c"
+                "reference": "d5574048b813f26f57996b0a7819a879df5826e2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/mikemadisonweb/yii2-rabbitmq/zipball/8bd72d8ba00862e71171e26f770ecc4676bd532c",
-                "reference": "8bd72d8ba00862e71171e26f770ecc4676bd532c",
+                "url": "https://api.github.com/repos/mikemadisonweb/yii2-rabbitmq/zipball/d5574048b813f26f57996b0a7819a879df5826e2",
+                "reference": "d5574048b813f26f57996b0a7819a879df5826e2",
                 "shasum": "",
                 "mirrors": [
                     {
@@ -773,7 +834,7 @@
                 "rabbitmq",
                 "yii2"
             ],
-            "time": "2019-07-08T13:33:10+00:00"
+            "time": "2019-04-23T12:48:21+00:00"
         },
         {
             "name": "php-amqplib/php-amqplib",
@@ -1977,8 +2038,7 @@
     "aliases": [],
     "minimum-stability": "dev",
     "stability-flags": {
-        "hollisho/yii2-redis-pub-sub": 20,
-        "mikemadisonweb/yii2-rabbitmq": 20
+        "hollisho/yii2-redis-pub-sub": 20
     },
     "prefer-stable": false,
     "prefer-lowest": false,

+ 4 - 4
vendor/composer/ClassLoader.php

@@ -279,7 +279,7 @@ class ClassLoader
      */
     public function setApcuPrefix($apcuPrefix)
     {
-        $this->apcuPrefix = function_exists('apcu_fetch') && filter_var(ini_get('apc.enabled'), FILTER_VALIDATE_BOOLEAN) ? $apcuPrefix : null;
+        $this->apcuPrefix = function_exists('apcu_fetch') && ini_get('apc.enabled') ? $apcuPrefix : null;
     }
 
     /**
@@ -377,11 +377,11 @@ class ClassLoader
             $subPath = $class;
             while (false !== $lastPos = strrpos($subPath, '\\')) {
                 $subPath = substr($subPath, 0, $lastPos);
-                $search = $subPath . '\\';
+                $search = $subPath.'\\';
                 if (isset($this->prefixDirsPsr4[$search])) {
-                    $pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
                     foreach ($this->prefixDirsPsr4[$search] as $dir) {
-                        if (file_exists($file = $dir . $pathEnd)) {
+                        $length = $this->prefixLengthsPsr4[$first][$search];
+                        if (file_exists($file = $dir . DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $length))) {
                             return $file;
                         }
                     }

+ 1 - 0
vendor/composer/autoload_psr4.php

@@ -26,6 +26,7 @@ return array(
     'Psr\\Http\\Message\\' => array($vendorDir . '/psr/http-message/src'),
     'PhpAmqpLib\\' => array($vendorDir . '/php-amqplib/php-amqplib/PhpAmqpLib'),
     'OSS\\' => array($vendorDir . '/aliyuncs/oss-sdk-php/src/OSS'),
+    'Lcobucci\\JWT\\' => array($vendorDir . '/lcobucci/jwt/src'),
     'GuzzleHttp\\Psr7\\' => array($vendorDir . '/guzzlehttp/psr7/src'),
     'GuzzleHttp\\Promise\\' => array($vendorDir . '/guzzlehttp/promises/src'),
     'GuzzleHttp\\' => array($vendorDir . '/guzzlehttp/guzzle/src'),

+ 8 - 0
vendor/composer/autoload_static.php

@@ -68,6 +68,10 @@ class ComposerStaticInit1bf592390398b3f4608da27e3f630485
         array (
             'OSS\\' => 4,
         ),
+        'L' => 
+        array (
+            'Lcobucci\\JWT\\' => 13,
+        ),
         'G' => 
         array (
             'GuzzleHttp\\Psr7\\' => 16,
@@ -161,6 +165,10 @@ class ComposerStaticInit1bf592390398b3f4608da27e3f630485
         array (
             0 => __DIR__ . '/..' . '/aliyuncs/oss-sdk-php/src/OSS',
         ),
+        'Lcobucci\\JWT\\' => 
+        array (
+            0 => __DIR__ . '/..' . '/lcobucci/jwt/src',
+        ),
         'GuzzleHttp\\Psr7\\' => 
         array (
             0 => __DIR__ . '/..' . '/guzzlehttp/psr7/src',

+ 124 - 61
vendor/composer/installed.json

@@ -824,67 +824,6 @@
             "yii2"
         ]
     },
-    {
-        "name": "mikemadisonweb/yii2-rabbitmq",
-        "version": "dev-master",
-        "version_normalized": "9999999-dev",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/mikemadisonweb/yii2-rabbitmq.git",
-            "reference": "8bd72d8ba00862e71171e26f770ecc4676bd532c"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/mikemadisonweb/yii2-rabbitmq/zipball/8bd72d8ba00862e71171e26f770ecc4676bd532c",
-            "reference": "8bd72d8ba00862e71171e26f770ecc4676bd532c",
-            "shasum": "",
-            "mirrors": [
-                {
-                    "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
-                    "preferred": true
-                }
-            ]
-        },
-        "require": {
-            "php": "^7.0",
-            "php-amqplib/php-amqplib": "^2.9",
-            "yiisoft/yii2": "^2.0"
-        },
-        "require-dev": {
-            "php-coveralls/php-coveralls": "^1.0",
-            "phpunit/phpunit": "^6.4"
-        },
-        "time": "2019-07-08T13:33:10+00:00",
-        "type": "yii2-extension",
-        "extra": {
-            "bootstrap": "mikemadisonweb\\rabbitmq\\DependencyInjection"
-        },
-        "installation-source": "source",
-        "autoload": {
-            "psr-4": {
-                "mikemadisonweb\\rabbitmq\\": ""
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Mikhail Bakulin",
-                "email": "mikemadweb@gmail.com"
-            }
-        ],
-        "description": "Wrapper based on php-amqplib to incorporate messaging in your Yii2 application via RabbitMQ. Inspired by RabbitMqBundle for Symfony 2, really awesome package.",
-        "keywords": [
-            "AMQP",
-            "distributed systems",
-            "extension",
-            "message queue",
-            "rabbitmq",
-            "yii2"
-        ]
-    },
     {
         "name": "php-amqplib/php-amqplib",
         "version": "dev-master",
@@ -2033,5 +1972,129 @@
             "swiftmailer",
             "yii2"
         ]
+    },
+    {
+        "name": "mikemadisonweb/yii2-rabbitmq",
+        "version": "2.2.1",
+        "version_normalized": "2.2.1.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/mikemadisonweb/yii2-rabbitmq.git",
+            "reference": "d5574048b813f26f57996b0a7819a879df5826e2"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/mikemadisonweb/yii2-rabbitmq/zipball/d5574048b813f26f57996b0a7819a879df5826e2",
+            "reference": "d5574048b813f26f57996b0a7819a879df5826e2",
+            "shasum": "",
+            "mirrors": [
+                {
+                    "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
+                    "preferred": true
+                }
+            ]
+        },
+        "require": {
+            "php": "^7.0",
+            "php-amqplib/php-amqplib": "^2.9",
+            "yiisoft/yii2": "^2.0"
+        },
+        "require-dev": {
+            "php-coveralls/php-coveralls": "^1.0",
+            "phpunit/phpunit": "^6.4"
+        },
+        "time": "2019-04-23T12:48:21+00:00",
+        "type": "yii2-extension",
+        "extra": {
+            "bootstrap": "mikemadisonweb\\rabbitmq\\DependencyInjection"
+        },
+        "installation-source": "source",
+        "autoload": {
+            "psr-4": {
+                "mikemadisonweb\\rabbitmq\\": ""
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Mikhail Bakulin",
+                "email": "mikemadweb@gmail.com"
+            }
+        ],
+        "description": "Wrapper based on php-amqplib to incorporate messaging in your Yii2 application via RabbitMQ. Inspired by RabbitMqBundle for Symfony 2, really awesome package.",
+        "keywords": [
+            "AMQP",
+            "distributed systems",
+            "extension",
+            "message queue",
+            "rabbitmq",
+            "yii2"
+        ]
+    },
+    {
+        "name": "lcobucci/jwt",
+        "version": "3.4.x-dev",
+        "version_normalized": "3.4.9999999.9999999-dev",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/lcobucci/jwt.git",
+            "reference": "a11ec5f4b4d75d1fcd04e133dede4c317aac9e18"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/lcobucci/jwt/zipball/a11ec5f4b4d75d1fcd04e133dede4c317aac9e18",
+            "reference": "a11ec5f4b4d75d1fcd04e133dede4c317aac9e18",
+            "shasum": "",
+            "mirrors": [
+                {
+                    "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
+                    "preferred": true
+                }
+            ]
+        },
+        "require": {
+            "ext-mbstring": "*",
+            "ext-openssl": "*",
+            "php": "^5.6 || ^7.0"
+        },
+        "require-dev": {
+            "mikey179/vfsstream": "~1.5",
+            "phpmd/phpmd": "~2.2",
+            "phpunit/php-invoker": "~1.1",
+            "phpunit/phpunit": "^5.7 || ^7.3",
+            "squizlabs/php_codesniffer": "~2.3"
+        },
+        "time": "2019-05-24T18:30:49+00:00",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "3.1-dev"
+            }
+        },
+        "installation-source": "source",
+        "autoload": {
+            "psr-4": {
+                "Lcobucci\\JWT\\": "src"
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "BSD-3-Clause"
+        ],
+        "authors": [
+            {
+                "name": "Luís Otávio Cobucci Oblonczyk",
+                "email": "lcobucci@gmail.com",
+                "role": "Developer"
+            }
+        ],
+        "description": "A simple library to work with JSON Web Token and JSON Web Signature",
+        "keywords": [
+            "JWS",
+            "jwt"
+        ]
     }
 ]

+ 1 - 0
vendor/lcobucci/jwt

@@ -0,0 +1 @@
+Subproject commit a11ec5f4b4d75d1fcd04e133dede4c317aac9e18

+ 17 - 0
vendor/mikemadisonweb/yii2-rabbitmq/.gitignore

@@ -0,0 +1,17 @@
+# phpstorm project files
+.idea
+
+# netbeans project files
+nbproject
+
+# zend studio for eclipse project files
+.buildpath
+.project
+.settings
+
+# windows thumbnail cache
+Thumbs.db
+
+composer.lock
+vendor
+build

+ 1 - 1
vendor/mikemadisonweb/yii2-rabbitmq/.travis.yml

@@ -20,4 +20,4 @@ after_success:
 cache:
   directories:
     - vendor
-    - $HOME/.cache/composer
+    - $HOME/.cache/composer

+ 44 - 46
vendor/mikemadisonweb/yii2-rabbitmq/README.md

@@ -33,57 +33,55 @@ return [
     // should be in common.php
     'components'    => [
         // ...
-        'rabbitmq' => [
-            'class' => \mikemadisonweb\rabbitmq\Configuration::class,
-            'connections' => [
-                [
-                    // You can pass these parameters as a single `url` option: https://www.rabbitmq.com/uri-spec.html
-                    'host' => 'YOUR_HOSTNAME',
-                    'port' => '5672',
-                    'user' => 'YOUR_USERNAME',
-                    'password' => 'YOUR_PASSWORD',
-                    'vhost' => '/',
-                ]
-                // When multiple connections is used you need to specify a `name` option for each one and define them in producer and consumer configuration blocks 
+        'class' => \mikemadisonweb\rabbitmq\Configuration::class,
+        'connections' => [
+            [
+                // You can pass these parameters as a single `url` option: https://www.rabbitmq.com/uri-spec.html
+                'host' => 'YOUR_HOSTNAME',
+                'port' => '5672',
+                'user' => 'YOUR_USERNAME',
+                'password' => 'YOUR_PASSWORD',
+                'vhost' => '/',
+            ]
+            // When multiple connections is used you need to specify a `name` option for each one and define them in producer and consumer configuration blocks 
+        ],
+        'exchanges' => [
+            [
+                'name' => 'YOUR_EXCHANGE_NAME',
+                'type' => 'direct'
+                // Refer to Defaults section for all possible options
             ],
-            'exchanges' => [
-                [
-                    'name' => 'YOUR_EXCHANGE_NAME',
-                    'type' => 'direct'
-                    // Refer to Defaults section for all possible options
-                ],
+        ],
+        'queues' => [
+            [
+                'name' => 'YOUR_QUEUE_NAME',
+                // Queue can be configured here the way you want it:
+                //'durable' => true,
+                //'auto_delete' => false,
             ],
-            'queues' => [
-                [
-                    'name' => 'YOUR_QUEUE_NAME',
-                    // Queue can be configured here the way you want it:
-                    //'durable' => true,
-                    //'auto_delete' => false,
-                ],
-                [
-                    'name' => 'YOUR_ANOTHER_QUEUE_NAME',
-                ],
+            [
+                'name' => 'YOUR_ANOTHER_QUEUE_NAME',
             ],
-            'bindings' => [
-                [
-                    'queue' => 'YOUR_QUEUE_NAME',
-                    'exchange' => 'YOUR_EXCHANGE_NAME',
-                    'routing_keys' => ['YOUR_ROUTING_KEY'],
-                ],
+        ],
+        'bindings' => [
+            [
+                'queue' => 'YOUR_QUEUE_NAME',
+                'exchange' => 'YOUR_EXCHANGE_NAME',
+                'routing_keys' => ['YOUR_ROUTING_KEY'],
             ],
-            'producers' => [
-                [
-                    'name' => 'YOUR_PRODUCER_NAME',
-                ],
+        ],
+        'producers' => [
+            [
+                'name' => 'YOUR_PRODUCER_NAME',
             ],
-            'consumers' => [
-                [
-                    'name' => 'YOUR_CONSUMER_NAME',
-                    // Every consumer should define one or more callbacks for corresponding queues
-                    'callbacks' => [
-                        // queue name => callback class name
-                        'YOUR_QUEUE_NAME' => \path\to\YourConsumer::class,
-                    ],
+        ],
+        'consumers' => [
+            [
+                'name' => 'YOUR_CONSUMER_NAME',
+                // Every consumer should define one or more callbacks for corresponding queues
+                'callbacks' => [
+                    // queue name => callback class name
+                    'YOUR_QUEUE_NAME' => \path\to\YourConsumer::class,
                 ],
             ],
         ],

+ 2 - 2
vendor/mikemadisonweb/yii2-rabbitmq/components/Logger.php

@@ -114,10 +114,10 @@ class Logger
     public function printInfo($message, $color = Console::FG_YELLOW)
     {
         if (Console::streamSupportsAnsiColors(\STDOUT)) {
-            $message = Console::ansiFormat($message, [$color]);
+            $message = Console::ansiFormat($message, [$color]) . "\n";
         }
 
-        return Console::output($message);
+        return Console::stdout($message);
     }
 
     /**

+ 1 - 1
vendor/yiisoft/extensions.php

@@ -78,7 +78,7 @@ return array (
   'mikemadisonweb/yii2-rabbitmq' => 
   array (
     'name' => 'mikemadisonweb/yii2-rabbitmq',
-    'version' => '9999999-dev',
+    'version' => '2.2.1.0',
     'alias' => 
     array (
       '@mikemadisonweb/rabbitmq' => $vendorDir . '/mikemadisonweb/yii2-rabbitmq',