Changeset 1518751
- Timestamp:
- 10/20/2016 05:38:54 PM (9 years ago)
- Location:
- wechat-broadcast
- Files:
-
- 9 edited
-
composer.lock (modified) (8 diffs)
-
vendor/composer/autoload_classmap.php (modified) (1 diff)
-
vendor/composer/autoload_static.php (modified) (1 diff)
-
vendor/composer/installed.json (modified) (4 diffs)
-
vendor/overtrue/wechat/composer.json (modified) (1 diff)
-
vendor/symfony/psr-http-message-bridge/.travis.yml (modified) (4 diffs)
-
vendor/symfony/psr-http-message-bridge/Factory/DiactorosFactory.php (modified) (3 diffs)
-
vendor/symfony/psr-http-message-bridge/Factory/HttpFoundationFactory.php (modified) (4 diffs)
-
vendor/symfony/psr-http-message-bridge/composer.json (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
wechat-broadcast/composer.lock
r1518743 r1518751 5 5 "This file is @generated automatically" 6 6 ], 7 "hash": " 184feab9021511a410041af31fffa94f",7 "hash": "558f9e7f931165e371e85fc9c52aafcb", 8 8 "content-hash": "a21bdd80028fea556230a083f705b9fc", 9 9 "packages": [ … … 329 329 { 330 330 "name": "overtrue/socialite", 331 "version": "1.0.1 7",331 "version": "1.0.18", 332 332 "source": { 333 333 "type": "git", 334 334 "url": "https://github.com/overtrue/socialite.git", 335 "reference": " 8d3785c2cf0fedaad4fbfe252ed53589359657cb"336 }, 337 "dist": { 338 "type": "zip", 339 "url": "https://api.github.com/repos/overtrue/socialite/zipball/ 8d3785c2cf0fedaad4fbfe252ed53589359657cb",340 "reference": " 8d3785c2cf0fedaad4fbfe252ed53589359657cb",335 "reference": "f45a64720c5de067146ebd8645beecb72b18487c" 336 }, 337 "dist": { 338 "type": "zip", 339 "url": "https://api.github.com/repos/overtrue/socialite/zipball/f45a64720c5de067146ebd8645beecb72b18487c", 340 "reference": "f45a64720c5de067146ebd8645beecb72b18487c", 341 341 "shasum": "" 342 342 }, … … 375 375 "weibo" 376 376 ], 377 "time": "2016-10- 09 10:27:53"377 "time": "2016-10-12 10:23:13" 378 378 }, 379 379 { 380 380 "name": "overtrue/wechat", 381 "version": "3.1. 3",381 "version": "3.1.6", 382 382 "source": { 383 383 "type": "git", 384 384 "url": "https://github.com/overtrue/wechat.git", 385 "reference": " 68e325d14c3460e3e789e947bce37ec8befc8aaf"386 }, 387 "dist": { 388 "type": "zip", 389 "url": "https://api.github.com/repos/overtrue/wechat/zipball/ 68e325d14c3460e3e789e947bce37ec8befc8aaf",390 "reference": " 68e325d14c3460e3e789e947bce37ec8befc8aaf",385 "reference": "313b193bcbf62968db87c8735a0c1d8c7eaf3fe0" 386 }, 387 "dist": { 388 "type": "zip", 389 "url": "https://api.github.com/repos/overtrue/wechat/zipball/313b193bcbf62968db87c8735a0c1d8c7eaf3fe0", 390 "reference": "313b193bcbf62968db87c8735a0c1d8c7eaf3fe0", 391 391 "shasum": "" 392 392 }, … … 400 400 "pimple/pimple": "~3.0", 401 401 "symfony/http-foundation": "~2.6|~2.7|~2.8|~3.0", 402 "symfony/psr-http-message-bridge": " 0.2"402 "symfony/psr-http-message-bridge": "~0.3" 403 403 }, 404 404 "require-dev": { 405 405 "mockery/mockery": "^1.0@dev", 406 "overtrue/phplint": " *",406 "overtrue/phplint": "dev-master", 407 407 "phpunit/phpunit": "~4.0" 408 408 }, … … 433 433 "weixin-sdk" 434 434 ], 435 "time": "2016- 08-08 13:37:53"435 "time": "2016-10-19 08:53:00" 436 436 }, 437 437 { … … 692 692 { 693 693 "name": "symfony/psr-http-message-bridge", 694 "version": "v0. 2",694 "version": "v0.4", 695 695 "source": { 696 696 "type": "git", 697 697 "url": "https://github.com/symfony/psr-http-message-bridge.git", 698 "reference": " dc7e308e1dc2898a46776e2221a643cb08315453"699 }, 700 "dist": { 701 "type": "zip", 702 "url": "https://api.github.com/repos/symfony/psr-http-message-bridge/zipball/ dc7e308e1dc2898a46776e2221a643cb08315453",703 "reference": " dc7e308e1dc2898a46776e2221a643cb08315453",698 "reference": "1c30b1781a5497ba0330769c7ddeb649d9e2f51e" 699 }, 700 "dist": { 701 "type": "zip", 702 "url": "https://api.github.com/repos/symfony/psr-http-message-bridge/zipball/1c30b1781a5497ba0330769c7ddeb649d9e2f51e", 703 "reference": "1c30b1781a5497ba0330769c7ddeb649d9e2f51e", 704 704 "shasum": "" 705 705 }, … … 713 713 }, 714 714 "suggest": { 715 "psr/http-message-implementation": "To use the HttpFoundation factory", 715 716 "zendframework/zend-diactoros": "To use the Zend Diactoros factory" 716 717 }, … … 742 743 "psr-7" 743 744 ], 744 "time": "201 5-05-29 17:57:12"745 "time": "2016-09-13 23:40:43" 745 746 } 746 747 ], -
wechat-broadcast/vendor/composer/autoload_classmap.php
r1518743 r1518751 327 327 'Symfony\\Bridge\\PsrHttpMessage\\Tests\\Fixtures\\Stream' => $vendorDir . '/symfony/psr-http-message-bridge/Tests/Fixtures/Stream.php', 328 328 'Symfony\\Bridge\\PsrHttpMessage\\Tests\\Fixtures\\UploadedFile' => $vendorDir . '/symfony/psr-http-message-bridge/Tests/Fixtures/UploadedFile.php', 329 'Symfony\\Bridge\\PsrHttpMessage\\Tests\\Fixtures\\Uri' => $vendorDir . '/symfony/psr-http-message-bridge/Tests/Fixtures/Uri.php', 329 330 'Symfony\\Component\\HttpFoundation\\AcceptHeader' => $vendorDir . '/symfony/http-foundation/AcceptHeader.php', 330 331 'Symfony\\Component\\HttpFoundation\\AcceptHeaderItem' => $vendorDir . '/symfony/http-foundation/AcceptHeaderItem.php', -
wechat-broadcast/vendor/composer/autoload_static.php
r1518743 r1518751 438 438 'Symfony\\Bridge\\PsrHttpMessage\\Tests\\Fixtures\\Stream' => __DIR__ . '/..' . '/symfony/psr-http-message-bridge/Tests/Fixtures/Stream.php', 439 439 'Symfony\\Bridge\\PsrHttpMessage\\Tests\\Fixtures\\UploadedFile' => __DIR__ . '/..' . '/symfony/psr-http-message-bridge/Tests/Fixtures/UploadedFile.php', 440 'Symfony\\Bridge\\PsrHttpMessage\\Tests\\Fixtures\\Uri' => __DIR__ . '/..' . '/symfony/psr-http-message-bridge/Tests/Fixtures/Uri.php', 440 441 'Symfony\\Component\\HttpFoundation\\AcceptHeader' => __DIR__ . '/..' . '/symfony/http-foundation/AcceptHeader.php', 441 442 'Symfony\\Component\\HttpFoundation\\AcceptHeaderItem' => __DIR__ . '/..' . '/symfony/http-foundation/AcceptHeaderItem.php', -
wechat-broadcast/vendor/composer/installed.json
r1518743 r1518751 59 59 "portable", 60 60 "shim" 61 ]62 },63 {64 "name": "symfony/psr-http-message-bridge",65 "version": "v0.2",66 "version_normalized": "0.2.0.0",67 "source": {68 "type": "git",69 "url": "https://github.com/symfony/psr-http-message-bridge.git",70 "reference": "dc7e308e1dc2898a46776e2221a643cb08315453"71 },72 "dist": {73 "type": "zip",74 "url": "https://api.github.com/repos/symfony/psr-http-message-bridge/zipball/dc7e308e1dc2898a46776e2221a643cb08315453",75 "reference": "dc7e308e1dc2898a46776e2221a643cb08315453",76 "shasum": ""77 },78 "require": {79 "php": ">=5.3.3",80 "psr/http-message": "~1.0",81 "symfony/http-foundation": "~2.3|~3.0"82 },83 "require-dev": {84 "symfony/phpunit-bridge": "~2.7|~3.0"85 },86 "suggest": {87 "zendframework/zend-diactoros": "To use the Zend Diactoros factory"88 },89 "time": "2015-05-29 17:57:12",90 "type": "symfony-bridge",91 "installation-source": "dist",92 "autoload": {93 "psr-4": {94 "Symfony\\Bridge\\PsrHttpMessage\\": ""95 }96 },97 "notification-url": "https://packagist.org/downloads/",98 "license": [99 "MIT"100 ],101 "authors": [102 {103 "name": "Symfony Community",104 "homepage": "http://symfony.com/contributors"105 },106 {107 "name": "Fabien Potencier",108 "email": "fabien@symfony.com"109 }110 ],111 "description": "PSR HTTP message bridge",112 "homepage": "http://symfony.com",113 "keywords": [114 "http",115 "http-message",116 "psr-7"117 61 ] 118 62 }, … … 519 463 "rest", 520 464 "web service" 521 ]522 },523 {524 "name": "overtrue/socialite",525 "version": "1.0.17",526 "version_normalized": "1.0.17.0",527 "source": {528 "type": "git",529 "url": "https://github.com/overtrue/socialite.git",530 "reference": "8d3785c2cf0fedaad4fbfe252ed53589359657cb"531 },532 "dist": {533 "type": "zip",534 "url": "https://api.github.com/repos/overtrue/socialite/zipball/8d3785c2cf0fedaad4fbfe252ed53589359657cb",535 "reference": "8d3785c2cf0fedaad4fbfe252ed53589359657cb",536 "shasum": ""537 },538 "require": {539 "guzzlehttp/guzzle": "~5.0|~6.0",540 "php": ">=5.4.0",541 "symfony/http-foundation": "~2.6|~2.7|~2.8|~3.0"542 },543 "require-dev": {544 "mockery/mockery": "~0.9",545 "phpunit/phpunit": "~4.0"546 },547 "time": "2016-10-09 10:27:53",548 "type": "library",549 "installation-source": "dist",550 "autoload": {551 "psr-4": {552 "Overtrue\\Socialite\\": "src/"553 }554 },555 "notification-url": "https://packagist.org/downloads/",556 "license": [557 "MIT"558 ],559 "authors": [560 {561 "name": "overtrue",562 "email": "anzhengchao@gmail.com"563 }564 ],565 "description": "A collection of OAuth 2 packages that extracts from laravel/socialite.",566 "keywords": [567 "login",568 "oauth",569 "qq",570 "social",571 "wechat",572 "weibo"573 465 ] 574 466 }, … … 703 595 }, 704 596 { 597 "name": "symfony/psr-http-message-bridge", 598 "version": "v0.4", 599 "version_normalized": "0.4.0.0", 600 "source": { 601 "type": "git", 602 "url": "https://github.com/symfony/psr-http-message-bridge.git", 603 "reference": "1c30b1781a5497ba0330769c7ddeb649d9e2f51e" 604 }, 605 "dist": { 606 "type": "zip", 607 "url": "https://api.github.com/repos/symfony/psr-http-message-bridge/zipball/1c30b1781a5497ba0330769c7ddeb649d9e2f51e", 608 "reference": "1c30b1781a5497ba0330769c7ddeb649d9e2f51e", 609 "shasum": "" 610 }, 611 "require": { 612 "php": ">=5.3.3", 613 "psr/http-message": "~1.0", 614 "symfony/http-foundation": "~2.3|~3.0" 615 }, 616 "require-dev": { 617 "symfony/phpunit-bridge": "~2.7|~3.0" 618 }, 619 "suggest": { 620 "psr/http-message-implementation": "To use the HttpFoundation factory", 621 "zendframework/zend-diactoros": "To use the Zend Diactoros factory" 622 }, 623 "time": "2016-09-13 23:40:43", 624 "type": "symfony-bridge", 625 "installation-source": "dist", 626 "autoload": { 627 "psr-4": { 628 "Symfony\\Bridge\\PsrHttpMessage\\": "" 629 } 630 }, 631 "notification-url": "https://packagist.org/downloads/", 632 "license": [ 633 "MIT" 634 ], 635 "authors": [ 636 { 637 "name": "Symfony Community", 638 "homepage": "http://symfony.com/contributors" 639 }, 640 { 641 "name": "Fabien Potencier", 642 "email": "fabien@symfony.com" 643 } 644 ], 645 "description": "PSR HTTP message bridge", 646 "homepage": "http://symfony.com", 647 "keywords": [ 648 "http", 649 "http-message", 650 "psr-7" 651 ] 652 }, 653 { 654 "name": "overtrue/socialite", 655 "version": "1.0.18", 656 "version_normalized": "1.0.18.0", 657 "source": { 658 "type": "git", 659 "url": "https://github.com/overtrue/socialite.git", 660 "reference": "f45a64720c5de067146ebd8645beecb72b18487c" 661 }, 662 "dist": { 663 "type": "zip", 664 "url": "https://api.github.com/repos/overtrue/socialite/zipball/f45a64720c5de067146ebd8645beecb72b18487c", 665 "reference": "f45a64720c5de067146ebd8645beecb72b18487c", 666 "shasum": "" 667 }, 668 "require": { 669 "guzzlehttp/guzzle": "~5.0|~6.0", 670 "php": ">=5.4.0", 671 "symfony/http-foundation": "~2.6|~2.7|~2.8|~3.0" 672 }, 673 "require-dev": { 674 "mockery/mockery": "~0.9", 675 "phpunit/phpunit": "~4.0" 676 }, 677 "time": "2016-10-12 10:23:13", 678 "type": "library", 679 "installation-source": "dist", 680 "autoload": { 681 "psr-4": { 682 "Overtrue\\Socialite\\": "src/" 683 } 684 }, 685 "notification-url": "https://packagist.org/downloads/", 686 "license": [ 687 "MIT" 688 ], 689 "authors": [ 690 { 691 "name": "overtrue", 692 "email": "anzhengchao@gmail.com" 693 } 694 ], 695 "description": "A collection of OAuth 2 packages that extracts from laravel/socialite.", 696 "keywords": [ 697 "login", 698 "oauth", 699 "qq", 700 "social", 701 "wechat", 702 "weibo" 703 ] 704 }, 705 { 705 706 "name": "overtrue/wechat", 706 "version": "3.1. 3",707 "version_normalized": "3.1. 3.0",707 "version": "3.1.6", 708 "version_normalized": "3.1.6.0", 708 709 "source": { 709 710 "type": "git", 710 711 "url": "https://github.com/overtrue/wechat.git", 711 "reference": " 68e325d14c3460e3e789e947bce37ec8befc8aaf"712 }, 713 "dist": { 714 "type": "zip", 715 "url": "https://api.github.com/repos/overtrue/wechat/zipball/ 68e325d14c3460e3e789e947bce37ec8befc8aaf",716 "reference": " 68e325d14c3460e3e789e947bce37ec8befc8aaf",712 "reference": "313b193bcbf62968db87c8735a0c1d8c7eaf3fe0" 713 }, 714 "dist": { 715 "type": "zip", 716 "url": "https://api.github.com/repos/overtrue/wechat/zipball/313b193bcbf62968db87c8735a0c1d8c7eaf3fe0", 717 "reference": "313b193bcbf62968db87c8735a0c1d8c7eaf3fe0", 717 718 "shasum": "" 718 719 }, … … 726 727 "pimple/pimple": "~3.0", 727 728 "symfony/http-foundation": "~2.6|~2.7|~2.8|~3.0", 728 "symfony/psr-http-message-bridge": " 0.2"729 "symfony/psr-http-message-bridge": "~0.3" 729 730 }, 730 731 "require-dev": { 731 732 "mockery/mockery": "^1.0@dev", 732 "overtrue/phplint": " *",733 "overtrue/phplint": "dev-master", 733 734 "phpunit/phpunit": "~4.0" 734 735 }, 735 "time": "2016- 08-08 13:37:53",736 "time": "2016-10-19 08:53:00", 736 737 "type": "library", 737 738 "installation-source": "dist", -
wechat-broadcast/vendor/overtrue/wechat/composer.json
r1518743 r1518751 24 24 "guzzlehttp/guzzle": "~6.2.1", 25 25 "symfony/http-foundation": "~2.6|~2.7|~2.8|~3.0", 26 "symfony/psr-http-message-bridge": " 0.2"26 "symfony/psr-http-message-bridge": "~0.3" 27 27 }, 28 28 "require-dev": { 29 29 "phpunit/phpunit": "~4.0", 30 "overtrue/phplint": " *",30 "overtrue/phplint": "dev-master", 31 31 "mockery/mockery": "^1.0@dev" 32 32 }, -
wechat-broadcast/vendor/symfony/psr-http-message-bridge/.travis.yml
r1518743 r1518751 2 2 3 3 sudo: false 4 5 cache: 6 directories: 7 - $HOME/.composer/cache/files 4 8 5 9 matrix: … … 13 17 - php: 5.6 14 18 env: deps=high 15 - php: nightly19 - php: 7.0 16 20 - php: hhvm 17 21 allow_failures: 18 - php: nightly19 22 - php: hhvm 20 23 fast_finish: true … … 26 29 27 30 before_install: 31 - if [[ "$TRAVIS_PHP_VERSION" != "nightly" ]] && [[ "$TRAVIS_PHP_VERSION" != "hhvm" ]]; then phpenv config-rm xdebug.ini; fi; 28 32 - composer self-update 29 - if [[ "$TRAVIS_PHP_VERSION" != "nightly" ]] && [[ "$TRAVIS_PHP_VERSION" != "hhvm" ]]; then phpenv config-rm xdebug.ini; fi;30 33 - if [[ "$TRAVIS_PHP_VERSION" != "nightly" ]] && [[ "$TRAVIS_PHP_VERSION" != "hhvm" ]] && [ $(php -r "echo PHP_MINOR_VERSION;") -le 4 ]; then echo "extension = apc.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi; 31 34 - if [[ "$TRAVIS_PHP_VERSION" != "nightly" ]] && [[ "$TRAVIS_PHP_VERSION" != "hhvm" ]]; then php -i; fi; … … 34 37 35 38 install: 36 - if [ [ "$TRAVIS_PHP_VERSION" != "5.3" ]] && [[ "$TRAVIS_PHP_VERSION" != "5.4" ]]; then composer require --no-update zendframework/zend-diactoros; fi;39 - if [ "$TRAVIS_PHP_VERSION" != "5.3" ]; then composer require --no-update zendframework/zend-diactoros; fi; 37 40 - if [ "$deps" = "no" ]; then export SYMFONY_DEPRECATIONS_HELPER=strict; fi; 38 41 - if [ "$deps" = "no" ]; then composer --prefer-source install; fi; -
wechat-broadcast/vendor/symfony/psr-http-message-bridge/Factory/DiactorosFactory.php
r1518743 r1518751 46 46 $headers = $symfonyRequest->headers->all(); 47 47 48 try { 49 $body = new DiactorosStream($symfonyRequest->getContent(true)); 50 } catch (\LogicException $e) { 48 if (PHP_VERSION_ID < 50600) { 51 49 $body = new DiactorosStream('php://temp', 'wb+'); 52 50 $body->write($symfonyRequest->getContent()); 51 } else { 52 $body = new DiactorosStream($symfonyRequest->getContent(true)); 53 53 } 54 54 … … 87 87 88 88 foreach ($uploadedFiles as $key => $value) { 89 if (null === $value) { 90 $files[$key] = new DiactorosUploadedFile(null, 0, UPLOAD_ERR_NO_FILE, null, null); 91 continue; 92 } 89 93 if ($value instanceof UploadedFile) { 90 94 $files[$key] = $this->createUploadedFile($value); … … 108 112 return new DiactorosUploadedFile( 109 113 $symfonyUploadedFile->getRealPath(), 110 $symfonyUploadedFile->get Size(),114 $symfonyUploadedFile->getClientSize(), 111 115 $symfonyUploadedFile->getError(), 112 116 $symfonyUploadedFile->getClientOriginalName(), -
wechat-broadcast/vendor/symfony/psr-http-message-bridge/Factory/HttpFoundationFactory.php
r1518743 r1518751 15 15 use Psr\Http\Message\ResponseInterface; 16 16 use Psr\Http\Message\UploadedFileInterface; 17 use Psr\Http\Message\UriInterface; 17 18 use Symfony\Bridge\PsrHttpMessage\HttpFoundationFactoryInterface; 18 19 use Symfony\Component\HttpFoundation\Cookie; … … 33 34 public function createRequest(ServerRequestInterface $psrRequest) 34 35 { 36 $server = array(); 37 $uri = $psrRequest->getUri(); 38 39 if ($uri instanceof UriInterface) { 40 $server['SERVER_NAME'] = $uri->getHost(); 41 $server['SERVER_PORT'] = $uri->getPort(); 42 $server['REQUEST_URI'] = $uri->getPath(); 43 $server['QUERY_STRING'] = $uri->getQuery(); 44 } 45 46 $server = array_replace($server, $psrRequest->getServerParams()); 47 35 48 $parsedBody = $psrRequest->getParsedBody(); 36 49 $parsedBody = is_array($parsedBody) ? $parsedBody : array(); … … 42 55 $psrRequest->getCookieParams(), 43 56 $this->getFiles($psrRequest->getUploadedFiles()), 44 $ psrRequest->getServerParams(),57 $server, 45 58 $psrRequest->getBody()->__toString() 46 59 ); … … 81 94 private function createUploadedFile(UploadedFileInterface $psrUploadedFile) 82 95 { 83 $temporaryPath = $this->getTemporaryPath(); 84 $psrUploadedFile->moveTo($temporaryPath); 85 86 $clientFileName = $psrUploadedFile->getClientFilename(); 96 $temporaryPath = ''; 97 $clientFileName = ''; 98 if (UPLOAD_ERR_NO_FILE !== $psrUploadedFile->getError()) { 99 $temporaryPath = $this->getTemporaryPath(); 100 $psrUploadedFile->moveTo($temporaryPath); 101 102 $clientFileName = $psrUploadedFile->getClientFilename(); 103 } 87 104 88 105 return new UploadedFile( -
wechat-broadcast/vendor/symfony/psr-http-message-bridge/composer.json
r1518743 r1518751 25 25 }, 26 26 "suggest": { 27 "psr/http-message-implementation": "To use the HttpFoundation factory", 27 28 "zendframework/zend-diactoros": "To use the Zend Diactoros factory" 28 29 },
Note: See TracChangeset
for help on using the changeset viewer.