Administrator / test_1

Commit 912e6b1557f79d75e02807f64df27c5fdaa50dd2

Authored by Mihail
1 parent ea4ecf3d

fixed Image class

Showing 4 changed files with 110 additions and 154 deletions   Show diff stats
Inline Side-by-side
common/components/parsers/CustomConverter.php
  Show/Hide comments   View file @912e6b1
1 1 <?php
2   -namespace backend\components\parsers;
  2 +namespace common\components\parsers;
3 3 use common\components\CustomVarDamp;
4 4 use yii\multiparser\Converter;
5 5 use backend\models\Details;
... ...
common/components/parsers/CustomCsvParser.php
  Show/Hide comments   View file @912e6b1
... ... @@ -6,7 +6,7 @@
6 6 * Time: 16:07
7 7 */
8 8  
9   -namespace backend\components\parsers;
  9 +namespace common\components\parsers;
10 10  
11 11  
12 12 use common\components\CustomVarDamp;
... ...
common/components/parsers/MailParser.php
  Show/Hide comments   View file @912e6b1
... ... @@ -6,7 +6,7 @@
6 6 * Time: 10:53
7 7 */
8 8  
9   -namespace backend\components\parsers;
  9 +namespace common\components\parsers;
10 10  
11 11  
12 12 class MailParser {
... ...
composer.lock
  Show/Hide comments   View file @912e6b1
... ... @@ -4,7 +4,7 @@
4 4 "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
5 5 "This file is @generated automatically"
6 6 ],
7   - "hash": "8580bd82955b1fbb80d47024e184056e",
  7 + "hash": "54588d810c5a77b1e177db18875540d1",
8 8 "packages": [
9 9 {
10 10 "name": "bower-asset/bootstrap",
... ... @@ -317,6 +317,58 @@
317 317 "time": "2013-11-30 08:25:19"
318 318 },
319 319 {
  320 + "name": "imagine/imagine",
  321 + "version": "v0.5.0",
  322 + "source": {
  323 + "type": "git",
  324 + "url": "https://github.com/avalanche123/Imagine.git",
  325 + "reference": "f64ec666baaa800edcbf237db41121a569230709"
  326 + },
  327 + "dist": {
  328 + "type": "zip",
  329 + "url": "https://api.github.com/repos/avalanche123/Imagine/zipball/f64ec666baaa800edcbf237db41121a569230709",
  330 + "reference": "f64ec666baaa800edcbf237db41121a569230709",
  331 + "shasum": ""
  332 + },
  333 + "require": {
  334 + "php": ">=5.3.2"
  335 + },
  336 + "require-dev": {
  337 + "sami/sami": "dev-master"
  338 + },
  339 + "suggest": {
  340 + "ext-gd": "to use the GD implementation",
  341 + "ext-gmagick": "to use the Gmagick implementation",
  342 + "ext-imagick": "to use the Imagick implementation"
  343 + },
  344 + "type": "library",
  345 + "autoload": {
  346 + "psr-0": {
  347 + "Imagine": "lib/"
  348 + }
  349 + },
  350 + "notification-url": "https://packagist.org/downloads/",
  351 + "license": [
  352 + "MIT"
  353 + ],
  354 + "authors": [
  355 + {
  356 + "name": "Bulat Shakirzyanov",
  357 + "email": "mallluhuct@gmail.com",
  358 + "homepage": "http://avalanche123.com"
  359 + }
  360 + ],
  361 + "description": "Image processing for PHP 5.3",
  362 + "homepage": "http://imagine.readthedocs.org/",
  363 + "keywords": [
  364 + "drawing",
  365 + "graphics",
  366 + "image manipulation",
  367 + "image processing"
  368 + ],
  369 + "time": "2013-07-10 17:25:36"
  370 + },
  371 + {
320 372 "name": "swiftmailer/swiftmailer",
321 373 "version": "v5.4.1",
322 374 "source": {
... ... @@ -459,21 +511,21 @@
459 511 },
460 512 {
461 513 "name": "yiisoft/yii2-bootstrap",
462   - "version": "2.0.4",
  514 + "version": "2.0.5",
463 515 "source": {
464 516 "type": "git",
465 517 "url": "https://github.com/yiisoft/yii2-bootstrap.git",
466   - "reference": "1b6b1e61cf91c3cdd517d6a7e71d30bb212e4af0"
  518 + "reference": "1464f93834b1d5edb1f5625f7ffd6c3723fa4923"
467 519 },
468 520 "dist": {
469 521 "type": "zip",
470   - "url": "https://api.github.com/repos/yiisoft/yii2-bootstrap/zipball/1b6b1e61cf91c3cdd517d6a7e71d30bb212e4af0",
471   - "reference": "1b6b1e61cf91c3cdd517d6a7e71d30bb212e4af0",
  522 + "url": "https://api.github.com/repos/yiisoft/yii2-bootstrap/zipball/1464f93834b1d5edb1f5625f7ffd6c3723fa4923",
  523 + "reference": "1464f93834b1d5edb1f5625f7ffd6c3723fa4923",
472 524 "shasum": ""
473 525 },
474 526 "require": {
475 527 "bower-asset/bootstrap": "3.3.* | 3.2.* | 3.1.*",
476   - "yiisoft/yii2": ">=2.0.4"
  528 + "yiisoft/yii2": ">=2.0.6"
477 529 },
478 530 "type": "yii2-extension",
479 531 "extra": {
... ... @@ -505,7 +557,7 @@
505 557 "bootstrap",
506 558 "yii2"
507 559 ],
508   - "time": "2015-05-10 22:08:17"
  560 + "time": "2015-09-23 17:48:24"
509 561 },
510 562 {
511 563 "name": "yiisoft/yii2-composer",
... ... @@ -555,6 +607,54 @@
555 607 "time": "2015-03-01 06:22:44"
556 608 },
557 609 {
  610 + "name": "yiisoft/yii2-imagine",
  611 + "version": "2.0.3",
  612 + "source": {
  613 + "type": "git",
  614 + "url": "https://github.com/yiisoft/yii2-imagine.git",
  615 + "reference": "0961343138b65bba447de84b2b300899617e6acc"
  616 + },
  617 + "dist": {
  618 + "type": "zip",
  619 + "url": "https://api.github.com/repos/yiisoft/yii2-imagine/zipball/0961343138b65bba447de84b2b300899617e6acc",
  620 + "reference": "0961343138b65bba447de84b2b300899617e6acc",
  621 + "shasum": ""
  622 + },
  623 + "require": {
  624 + "imagine/imagine": "0.5.*",
  625 + "yiisoft/yii2": "*"
  626 + },
  627 + "type": "yii2-extension",
  628 + "extra": {
  629 + "branch-alias": {
  630 + "dev-master": "2.0.x-dev"
  631 + }
  632 + },
  633 + "autoload": {
  634 + "psr-4": {
  635 + "yii\\imagine\\": ""
  636 + }
  637 + },
  638 + "notification-url": "https://packagist.org/downloads/",
  639 + "license": [
  640 + "BSD-3-Clause"
  641 + ],
  642 + "authors": [
  643 + {
  644 + "name": "Antonio Ramirez",
  645 + "email": "amigo.cobos@gmail.com"
  646 + }
  647 + ],
  648 + "description": "The Imagine integration for the Yii framework",
  649 + "keywords": [
  650 + "helper",
  651 + "image",
  652 + "imagine",
  653 + "yii2"
  654 + ],
  655 + "time": "2015-03-01 06:22:44"
  656 + },
  657 + {
558 658 "name": "yiisoft/yii2-swiftmailer",
559 659 "version": "2.0.4",
560 660 "source": {
... ... @@ -634,101 +734,6 @@
634 734 }
635 735 },
636 736 {
637   - "name": "composer/installers",
638   - "version": "v1.0.21",
639   - "source": {
640   - "type": "git",
641   - "url": "https://github.com/composer/installers.git",
642   - "reference": "d64e23fce42a4063d63262b19b8e7c0f3b5e4c45"
643   - },
644   - "dist": {
645   - "type": "zip",
646   - "url": "https://api.github.com/repos/composer/installers/zipball/d64e23fce42a4063d63262b19b8e7c0f3b5e4c45",
647   - "reference": "d64e23fce42a4063d63262b19b8e7c0f3b5e4c45",
648   - "shasum": ""
649   - },
650   - "replace": {
651   - "roundcube/plugin-installer": "*",
652   - "shama/baton": "*"
653   - },
654   - "require-dev": {
655   - "composer/composer": "1.0.*@dev",
656   - "phpunit/phpunit": "4.1.*"
657   - },
658   - "type": "composer-installer",
659   - "extra": {
660   - "class": "Composer\\Installers\\Installer",
661   - "branch-alias": {
662   - "dev-master": "1.0-dev"
663   - }
664   - },
665   - "autoload": {
666   - "psr-0": {
667   - "Composer\\Installers\\": "src/"
668   - }
669   - },
670   - "notification-url": "https://packagist.org/downloads/",
671   - "license": [
672   - "MIT"
673   - ],
674   - "authors": [
675   - {
676   - "name": "Kyle Robinson Young",
677   - "email": "kyle@dontkry.com",
678   - "homepage": "https://github.com/shama"
679   - }
680   - ],
681   - "description": "A multi-framework Composer library installer",
682   - "homepage": "http://composer.github.com/installers/",
683   - "keywords": [
684   - "Craft",
685   - "Dolibarr",
686   - "Hurad",
687   - "MODX Evo",
688   - "OXID",
689   - "SMF",
690   - "Thelia",
691   - "WolfCMS",
692   - "agl",
693   - "aimeos",
694   - "annotatecms",
695   - "bitrix",
696   - "cakephp",
697   - "chef",
698   - "codeigniter",
699   - "concrete5",
700   - "croogo",
701   - "dokuwiki",
702   - "drupal",
703   - "elgg",
704   - "fuelphp",
705   - "grav",
706   - "installer",
707   - "joomla",
708   - "kohana",
709   - "laravel",
710   - "lithium",
711   - "magento",
712   - "mako",
713   - "mediawiki",
714   - "modulework",
715   - "moodle",
716   - "phpbb",
717   - "piwik",
718   - "ppi",
719   - "puppet",
720   - "roundcube",
721   - "shopware",
722   - "silverstripe",
723   - "symfony",
724   - "typo3",
725   - "wordpress",
726   - "zend",
727   - "zikula"
728   - ],
729   - "time": "2015-02-18 17:17:01"
730   - },
731   - {
732 737 "name": "fzaninotto/faker",
733 738 "version": "v1.5.0",
734 739 "source": {
... ... @@ -815,55 +820,6 @@
815 820 "time": "2013-11-01 13:02:21"
816 821 },
817 822 {
818   - "name": "silverstripe/framework",
819   - "version": "3.1.13",
820   - "source": {
821   - "type": "git",
822   - "url": "https://github.com/silverstripe/silverstripe-framework.git",
823   - "reference": "04b803dfc6dc60f2e6a38fa74f957156230b54be"
824   - },
825   - "dist": {
826   - "type": "zip",
827   - "url": "https://api.github.com/repos/silverstripe/silverstripe-framework/zipball/04b803dfc6dc60f2e6a38fa74f957156230b54be",
828   - "reference": "04b803dfc6dc60f2e6a38fa74f957156230b54be",
829   - "shasum": ""
830   - },
831   - "require": {
832   - "composer/installers": "*",
833   - "php": ">=5.3.2"
834   - },
835   - "require-dev": {
836   - "phpunit/phpunit": "~3.7@stable"
837   - },
838   - "type": "silverstripe-module",
839   - "autoload": {
840   - "classmap": [
841   - "tests/behat/features/bootstrap"
842   - ]
843   - },
844   - "notification-url": "https://packagist.org/downloads/",
845   - "license": [
846   - "BSD-3-Clause"
847   - ],
848   - "authors": [
849   - {
850   - "name": "SilverStripe",
851   - "homepage": "http://silverstripe.com"
852   - },
853   - {
854   - "name": "The SilverStripe Community",
855   - "homepage": "http://silverstripe.org"
856   - }
857   - ],
858   - "description": "The SilverStripe framework",
859   - "homepage": "http://silverstripe.org",
860   - "keywords": [
861   - "framework",
862   - "silverstripe"
863   - ],
864   - "time": "2015-05-28 06:59:11"
865   - },
866   - {
867 823 "name": "yiisoft/yii2-codeception",
868 824 "version": "2.0.4",
869 825 "source": {
... ...