Skip to content

Commit

Permalink
Resolve composer workflow conflict temporarily
Browse files Browse the repository at this point in the history
yiisoft/yii-dataview requires yiisoft/data DEV-MASTER but yiisoft/yii-cycle depends on yiisoft/data ^1.0 therefore:

For future potential changes:
Step 1: Fork yiisoft/yii-cycle
Step 2: Important. Edit via github desktop rossaddison/yii-cycle composer.json
           Change the name from yiisoft/yii-cycle to rossaddison/yii-cycle

{
    "name": "rossaddison/invoice",

Step 3: Goto packagist.org and register the rossaddison/yii-cycle
  • Loading branch information
rossaddison committed Nov 24, 2023
1 parent 33ccf37 commit 5633fdc
Showing 1 changed file with 8 additions and 3 deletions.
11 changes: 8 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,9 @@
"yiisoft/config": "^1.0",
"yiisoft/cookies": "^1.2",
"yiisoft/csrf": "^2.0",
"yiisoft/data":"^1.0",

"yiisoft/data":"dev-master",

"yiisoft/data-response": "^2.0",
"yiisoft/definitions": "^3.0",
"yiisoft/di": "^1.2",
Expand Down Expand Up @@ -122,7 +124,9 @@
"yiisoft/yii-bootstrap5": "^3.0@dev",
"yiisoft/yii-bulma": "*",
"yiisoft/yii-console": "^2.0",
"yiisoft/yii-cycle":"dev-master",

"rossaddison/yii-cycle":"dev-master",

"yiisoft/yii-dataview": "^3.0@dev",

"yiisoft/yii-debug": "*",
Expand All @@ -137,7 +141,8 @@
"yiisoft/yii-runner-http": "^2.0",
"yiisoft/yii-sentry": "dev-master",
"yiisoft/yii-swagger": "^2.0",
"yiisoft/yii-view": "^6.0"
"yiisoft/yii-view": "^6.0",
"kartik-v/yii2-bootstrap4-dropdown": "*"
},

"require-dev": {
Expand Down

0 comments on commit 5633fdc

Please sign in to comment.